From 0869ba3f9b926d0c0aa50ee2f71af4e9b5829be8 Mon Sep 17 00:00:00 2001 From: vaclavt Date: Mon, 28 Feb 2022 19:48:45 +0100 Subject: [PATCH] remove duplicated functionality --- ml.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/ml.cpp b/ml.cpp index 7e9d1e5..e690eac 100644 --- a/ml.cpp +++ b/ml.cpp @@ -1165,18 +1165,6 @@ MlValue read(std::vector args, MlEnvironment &env) { return run(line, env); } -// Read line from stdin -MlValue read_line(std::vector args, MlEnvironment &env) { - eval_args(args, env); - - if (args.size() != 0) - throw MlError(MlValue("read-line", read_line), env, TOO_MANY_ARGS); - - std::string line; - std::getline(std::cin, line); - return MlValue::string(line); -} - // Get the contents of a file MlValue read_file(std::vector args, MlEnvironment &env) { eval_args(args, env); @@ -1425,7 +1413,8 @@ MlValue get_env(std::vector args, MlEnvironment &env) { if (const char* env_p = std::getenv(args[0].as_string().c_str())) return MlValue::string(env_p); else - return MlValue::nil(); + // TODO maybe better to return MlValue::nil(); + return MlValue::string(""); } // set environment variable @@ -2208,11 +2197,10 @@ std::map builtin_funcs std::make_pair("exit", builtin::exit), std::make_pair("quit", builtin::exit), std::make_pair("print", builtin::print), - std::make_pair("input", builtin::input), std::make_pair("random", builtin::random), std::make_pair("include", builtin::include), + std::make_pair("input", builtin::input), std::make_pair("read", builtin::read), - std::make_pair("read-line", builtin::read_line), std::make_pair("read-file", builtin::read_file), std::make_pair("read-file-lines", builtin::read_file_lines), std::make_pair("write-file", builtin::write_file),