michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(shell/lean): remove useless output

Browse source 
It was added for implementing the web version, and avoid the need to
simulate a file system in the web browser.
It turns out we decided to use a virtual file system.
This commit is contained in:
Leonardo de Moura 2015-04-27 10:12:33 -07:00
parent 76c773ad3d
commit 68383d49de
1 changed files with 1 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/shell/lean.cpp
View file

@ -95,7 +95,6 @@ static void display_help(std::ostream & out) {
std::cout << " --githash display the git commit hash number used to build this binary\n"; std::cout << " --githash display the git commit hash number used to build this binary\n";
std::cout << " --path display the path used for finding Lean libraries and extensions\n"; std::cout << " --path display the path used for finding Lean libraries and extensions\n";
std::cout << " --output=file -o save the final environment in binary format in the given file\n"; std::cout << " --output=file -o save the final environment in binary format in the given file\n";
std::cout << " --cpp=file -C save the final environment as a C++ array\n";
std::cout << " --luahook=num -k how often the Lua interpreter checks the interrupted flag,\n"; std::cout << " --luahook=num -k how often the Lua interpreter checks the interrupted flag,\n";
std::cout << " it is useful for interrupting non-terminating user scripts,\n"; std::cout << " it is useful for interrupting non-terminating user scripts,\n";
std::cout << " 0 means 'do not check'.\n"; std::cout << " 0 means 'do not check'.\n";
@ -153,7 +152,6 @@ static struct option g_long_options[] = {
{"luahook", required_argument, 0, 'k'}, {"luahook", required_argument, 0, 'k'},
{"githash", no_argument, 0, 'g'}, {"githash", no_argument, 0, 'g'},
{"output", required_argument, 0, 'o'}, {"output", required_argument, 0, 'o'},
{"cpp", required_argument, 0, 'C'},
{"memory", required_argument, 0, 'M'}, {"memory", required_argument, 0, 'M'},
{"trust", required_argument, 0, 't'}, {"trust", required_argument, 0, 't'},
{"discard", no_argument, 0, 'r'}, {"discard", no_argument, 0, 'r'},
@ -177,7 +175,7 @@ static struct option g_long_options[] = {
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
#define OPT_STR "PHRXFC:dD:qrlupgvhk:012t:012o:c:i:L:012O:012G" #define OPT_STR "PHRXFdD:qrlupgvhk:012t:012o:c:i:L:012O:012G"
#if defined(LEAN_TRACK_MEMORY) #if defined(LEAN_TRACK_MEMORY)
#define OPT_STR2 OPT_STR "M:012" #define OPT_STR2 OPT_STR "M:012"
@ -236,23 +234,6 @@ options set_config_option(options const & opts, char const * in) {
} }
} }
static void export_as_cpp_file(std::string const & fname, char const * varname, environment const & env) {
std::ostringstream buffer(std::ofstream::binary);
export_module(buffer, env);
std::string r = buffer.str();
std::ofstream out(fname);
out << "// automatically generated file do not edit\n";
out << "namespace lean {\n";
out << " char " << varname << "[" << r.size() + 1 << "] = {";
for (unsigned i = 0; i < r.size(); i++) {
if (i > 0)
out << ", ";
out << static_cast<unsigned>(static_cast<unsigned char>(r[i]));
}
out << " }\n";
out << "}\n";
}
environment import_module(environment const & env, io_state const & ios, module_name const & mod, bool keep_proofs = true) { environment import_module(environment const & env, io_state const & ios, module_name const & mod, bool keep_proofs = true) {
std::string base = "."; std::string base = ".";
bool num_threads = 1; bool num_threads = 1;
@ -348,11 +329,9 @@ int main(int argc, char ** argv) {
unsigned num_threads = 1; unsigned num_threads = 1;
bool use_cache = false; bool use_cache = false;
bool gen_index = false; bool gen_index = false;
bool export_cpp = false;
keep_theorem_mode tmode = keep_theorem_mode::All; keep_theorem_mode tmode = keep_theorem_mode::All;
options opts; options opts;
std::string output; std::string output;
std::string cpp_output;
std::string cache_name; std::string cache_name;
std::string index_name; std::string index_name;
optional<unsigned> line; optional<unsigned> line;
@ -406,10 +385,6 @@ int main(int argc, char ** argv) {
output = optarg; output = optarg;
export_objects = true; export_objects = true;
break; break;
case 'C':
cpp_output = optarg;
export_cpp = true;
break;
case 'c': case 'c':
cache_name = optarg; cache_name = optarg;
use_cache = true; use_cache = true;
@ -598,9 +573,6 @@ int main(int argc, char ** argv) {
std::ofstream out(output, std::ofstream::binary); std::ofstream out(output, std::ofstream::binary);
export_module(out, env); export_module(out, env);
} }
if (export_cpp && ok) {
export_as_cpp_file(cpp_output, "olean_lib", env);
}
return ok ? 0 : 1; return ok ? 0 : 1;
} catch (lean::throwable & ex) { } catch (lean::throwable & ex) {
lean::display_error(diagnostic(env, ios), nullptr, ex); lean::display_error(diagnostic(env, ios), nullptr, ex);