X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=cint%2Fginaccint.bin.cpp;h=dca000f3ac05bc0ed9017fc415a8a8d89e0fe246;hp=9e095cf920d0daa8fbfd59dd2e6fbeb8bb57275f;hb=d1f72d0a85b377149a217057779d98060c283692;hpb=aea3e2f50b528c35ff073c79777e9b3707e739a3 diff --git a/cint/ginaccint.bin.cpp b/cint/ginaccint.bin.cpp index 9e095cf9..dca000f3 100644 --- a/cint/ginaccint.bin.cpp +++ b/cint/ginaccint.bin.cpp @@ -1,7 +1,10 @@ +/* ginaccint.bin.cpp: Binary depends on CINTSYSDIR, better don't call it + * directly. Use the launcher (compiled from ginaccint.cpp) instead. */ + #include "G__ci.h" /* G__atpause is defined in G__ci.h */ -#if (!defined(G__CINTVERSION)) || (G__CINTVERSION < 501438) -#error You need at least cint 5.14.38 to compile GiNaC-cint. Download it via http from root.cern.ch/root/Cint.html or via ftp from ftpthep.physik.uni-mainz.de/pub/cint +#if (!defined(G__CINTVERSION)) || (G__CINTVERSION < 501439) +#error You need at least cint 5.14.39 to compile GiNaC-cint. Download it via http from root.cern.ch/root/Cint.html or via ftp from ftpthep.physik.uni-mainz.de/pub/cint #endif // (!defined(G__CINTVERSION)) || (G__CINTVERSION < 501438) #include @@ -28,46 +31,49 @@ extern "C" void G__store_undo_position(void); #include template -string ToString(const T & t) +std::string ToString(const T & t) { char buf[256]; ostrstream(buf,sizeof(buf)) << t << ends; return buf; } -basic * ex::last_created_or_assigned_bp=0; -basic * ex::dummy_bp=0; -long ex::last_created_or_assigned_exp=0; +basic * ex::last_created_or_assigned_bp = 0; +basic * ex::dummy_bp = 0; +long ex::last_created_or_assigned_exp = 0; #endif // def OBSCURE_CINT_HACK -G__value exec_tempfile(string const & command); -char * process_permanentfile(string const & command); -void process_tempfile(string const & command); +G__value exec_tempfile(std::string const & command); +char * process_permanentfile(std::string const & command); +void process_tempfile(std::string const & command); void greeting(void); void helpmessage(void); -string preprocess(char const * const line, bool & comment, bool & single_quote, - bool & double_quote, unsigned & open_braces); +std::string preprocess(char const * const line, bool & comment, bool & single_quote, + bool & double_quote, unsigned & open_braces); void cleanup(void); void sigterm_handler(int n); void initialize(void); void initialize_cint(void); void restart(void); -bool readlines(istream * is, string & allcommands); -bool readfile(string const & filename, string & allcommands); -void savefile(string const & filename, string const & allcommands); +bool is_command(std::string const & command, std::string & preprocessed, + std::string const & comparevalue, bool substr=false); +bool readlines(istream * is, std::string & allcommands); +bool readfile(std::string const & filename, std::string & allcommands, bool shutup=false); +void savefile(std::string const & filename, std::string const & allcommands); typedef list cplist; cplist filenames; -bool redirect_output=false; +bool redirect_output = false; +bool silent = false; -G__value exec_tempfile(string const & command) +G__value exec_tempfile(std::string const & command) { G__value retval; char *tmpfilename = tempnam(NULL,"ginac"); - ofstream fout; + std::ofstream fout; fout.open(tmpfilename); - fout << "{" << endl << command << endl << "}" << endl; + fout << "{" << std::endl << command << std::endl << "}" << std::endl; fout.close(); G__store_undo_position(); retval = G__exec_tempfile(tmpfilename); @@ -77,13 +83,14 @@ G__value exec_tempfile(string const & command) return retval; } -char * process_permanentfile(string const & command) +char * process_permanentfile(std::string const & command) { char *tmpfilename = tempnam(NULL,"ginac"); - cout << "creating file " << tmpfilename << endl; - ofstream fout; + if (!silent) + std::cout << "creating file " << tmpfilename << std::endl; + std::ofstream fout; fout.open(tmpfilename); - fout << command << endl; + fout << command << std::endl; fout.close(); G__store_undo_position(); G__loadfile(tmpfilename); @@ -91,7 +98,7 @@ char * process_permanentfile(string const & command) return tmpfilename; } -void process_tempfile(string const & command) +void process_tempfile(std::string const & command) { #ifdef OBSCURE_CINT_HACK static G__value ref_symbol = exec_tempfile("symbol ginac_cint_internal_symbol; ginac_cint_internal_symbol;"); @@ -100,7 +107,7 @@ void process_tempfile(string const & command) static G__value ref_power = exec_tempfile("power(ex(ginac_cint_internal_symbol),ex(ginac_cint_internal_symbol));"); static G__value ref_numeric = exec_tempfile("numeric ginac_cint_internal_numeric; ginac_cint_internal_numeric;"); static G__value ref_ex = exec_tempfile("ex ginac_cint_internal_ex; ginac_cint_internal_ex;"); - static bool basic_type_warning_already_displayed=false; + static bool basic_type_warning_already_displayed = false; #endif // def OBSCURE_CINT_HACK G__value retval = exec_tempfile(command); @@ -111,30 +118,27 @@ void process_tempfile(string const & command) static unsigned out_count = 0; if (TYPES_EQUAL(retval,ref_ex)) { - string varname = "Out"+ToString(++out_count); + std::string varname = "Out"+ToString(++out_count); if (retval.obj.i!=ex::last_created_or_assigned_exp) { // an ex was returned, but this is not the ex which was created last // => this is not a temporary ex, but one that resides safely in memory - // cout << "warning: using ex from retval (experimental)" << endl; - ex::dummy_bp=((ex *)(void *)(retval.obj.i))->bp; + // std::cout << "warning: using ex from retval (experimental)" << std::endl; + ex::dummy_bp = ((ex *)(void *)(retval.obj.i))->bp; exec_tempfile("ex "+varname+"(*ex::dummy_bp);"); } else if (ex::last_created_or_assigned_bp_can_be_converted_to_ex()) { - //string varfill; - //for (int i=4-int(log10(out_count)); i>0; --i) - // varfill += ' '; exec_tempfile("ex "+varname+"(*ex::last_created_or_assigned_bp);"); } else { - cout << "warning: last_created_or_assigned_bp modified 0 or not evaluated or not dynallocated" << endl; + std::cout << "warning: last_created_or_assigned_bp modified 0 or not evaluated or not dynallocated" << std::endl; } - exec_tempfile(string()+"LLLAST=LLAST;\n" + exec_tempfile(std::string()+"LLLAST=LLAST;\n" +"LLAST=LAST;\n" +"LAST="+varname+";\n" +"if (ginac_cint_internal_redirect_output&&" +" ginac_cint_internal_fout.good()) {" +" ginac_cint_internal_fout << \""+varname+" = \" << "+varname+" << endl << endl;" +"} else {" - +" cout << \""+varname+" = \" << "+varname+" << endl << endl;" + +" std::cout << \""+varname+" = \" << "+varname+" << endl << endl;" +"}"); } else if (TYPES_EQUAL(retval,ref_symbol)|| TYPES_EQUAL(retval,ref_constant)|| @@ -142,104 +146,122 @@ void process_tempfile(string const & command) TYPES_EQUAL(retval,ref_power)|| TYPES_EQUAL(retval,ref_numeric)) { if (!basic_type_warning_already_displayed) { - cout << endl - <<"WARNING: The return value of the last expression you entered was a symbol," << endl - << "constant, function, power or numeric, which cannot be safely displayed." << endl - << "To force the output, cast it explicitly to type 'ex' or use 'cout'," << endl - << "for example (assume 'x' is a symbol):" << endl - << PROMPT1 "ex(x);" << endl - << "OutX = x" << endl << endl - << PROMPT1 "cout << x << endl;" << endl - << "x" << endl << endl - << "This warning will not be shown again." << endl; - basic_type_warning_already_displayed=true; + std::cout << std::endl + <<"WARNING: The return value of the last expression you entered was a symbol," << std::endl + << "constant, function, power or numeric, which cannot be safely displayed." << std::endl + << "To force the output, cast it explicitly to type 'ex' or use 'cout'," << std::endl + << "for example (assume 'x' is a symbol):" << std::endl + << PROMPT1 "ex(x);" << std::endl + << "OutX = x" << std::endl << std::endl + << PROMPT1 "cout << x << endl;" << std::endl + << "x" << std::endl << std::endl + << "This warning will not be shown again." << std::endl; + basic_type_warning_already_displayed = true; } } #endif // def OBSCURE_CINT_HACK + return; } void greeting(void) { - cout << "Welcome to GiNaC-cint (" << PACKAGE << " V" << VERSION << ")" << endl; - cout << "This software is provided \"as is\" without any warranty. Copyright of Cint is" << endl - << "owned by Agilent Technologies Japan and Masaharu Goto. Registration is" << endl - << " __, _______ requested, at this moment, for commercial use. Send e-mail to" << endl - << " (__) * | . The registration is free." << endl - << " ._) i N a C | The GiNaC framework is Copyright by Johannes Gutenberg Univ.," << endl - << "<-------------' Germany and licensed under the terms and conditions of the GPL." << endl - << "Type .help for help." << endl - << endl; + std::cout << "Welcome to GiNaC-cint (" << PACKAGE << " V" << VERSION + << ", Cint V" << G__CINTVERSION << ")\n"; + std::cout << " __, _______ GiNaC: (C) 1999-2000 Johannes Gutenberg University Mainz,\n" + << " (__) * | Germany. Cint C/C++ interpreter: (C) 1995-2000 Masaharu\n" + << " ._) i N a C | Goto and Agilent Technologies, Japan. This is free software\n" + << "<-------------' with ABSOLUTELY NO WARRANTY. For details, type `.warranty'\n" + << "Type `.help' for help.\n\n"; + return; } void helpmessage(void) { - cout << "GiNaC-cint recognizes some special commands which start with a dot:" << endl << endl - << " .cint switch to cint interactive mode (see cint" << endl - << " documentation for further details)" << endl - << " .function define the body of a function (necessary due to a" << endl - << " cint limitation)" << endl - << " .help the text you are currently reading" << endl - << " .q, .quit, .exit, .bye quit GiNaC-cint" << endl - << " .read filename read a file from disk and execute it in GiNaC-cint" << endl - << " (recursive call is possible)" << endl - << " .redirect [filename] redirect 'OutXY = ...' output to a file" << endl - << " (.redirect alone redirects output back to console)" << endl - << " .restart restart GiNaC-cint (does not re-read command line" << endl - << " files)" << endl - << " .save filename save the commands you have entered so far in a file" << endl - << " .silent suppress 'OutXY = ...' output (variables are still" << endl - << " accessible)" << endl - << " .> [filename] same as .redirect [filename]" << endl << endl -<< "Additionally you can exit GiNaC-cint with quit; exit; or bye;" << endl - << endl; + std::cout << "GiNaC-cint recognizes some special commands which start with a dot:\n\n" + << " .cint switch to cint interactive mode (see cint\n" + << " documentation for further details)\n" + << " .function define the body of a function (necessary due to a\n" + << " cint limitation)\n" + << " .help the text you are currently reading\n" + << " .q, .quit, .exit, .bye quit GiNaC-cint\n" + << " .read filename read a file from disk and execute it in GiNaC-cint\n" + << " (recursive call is possible)\n" + << " .redirect [filename] redirect 'OutXY = ...' output to a file\n" + << " (.redirect alone redirects output back to console)\n" + << " .restart restart GiNaC-cint (does not re-read command line\n" + << " files)\n" + << " .save filename save the commands you have entered so far in a file\n" + << " .silent suppress 'OutXY = ...' output (variables are still\n" + << " accessible)\n" + << " .warranty information on redistribution and warranty\n" + << " .> [filename] same as .redirect [filename]\n\n" + << "Instead of '.cmd' you can also write '//GiNaC-cint.cmd' to be compatible with\n" + << "programs that will be compiled later.\n" + << "Additionally you can exit GiNaC-cint with quit; exit; or bye;\n\n"; + return; } -string preprocess(char const * const line, bool & comment, bool & single_quote, - bool & double_quote, unsigned & open_braces) +void warrantymessage(void) { - // "preprocess" the line entered to be able to decide if the command shall be - // executed directly or more input is needed or this is a special command - - // ALL whitespace will be removed - // all comments (/* */ and //) will be removed - // open and close braces ( { and } ) outside strings will be counted - - /* - cout << "line=" << line << endl; - cout << "comment=" << comment << ", single_quote=" << single_quote - << ",double_quote=" << double_quote << ", open_braces=" << open_braces - << endl; - */ - - string preprocessed; - int pos=0; - bool end=false; - bool escape=false; - bool slash=false; - bool asterisk=false; + std::cout << "GiNaC is free software; you can redistribute it and/or modify it under the\n" + << "the terms of the GNU General Public License as published by the Free Software\n" + << "Foundation; either version 2 of the License, or (at your option) any later\n" + << "version.\n" + << "This program is distributed in the hope that it will be useful, but WITHOUT\n" + << "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n" + << "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\n" + << "details.\n" + << "You should have received a copy of the GNU General Public License along with\n" + << "this program. If not, write to the Free Software Foundation, 675 Mass Ave,\n" + << "Cambridge, MA 02139, USA.\n\n"; + std::cout << "Cint and associated tools are copyright by Agilent Technologies Japan Company\n" + << "and Masaharu Goto .\n" + << "Source code, binary executable or library of Cint and associated tools can be\n" + << "used, modified and distributed with no royalty for any purpose provided that\n" + << "the copyright notice appear in all copies and that both that copyright notice\n" + << "and this permission notice appear in supporting documentation.\n" + << "Agilent Technologies Japan and the author make no representations about the\n" + << "suitability of this software for any purpose. It is provided \"AS IS\"\n" + << "without express or implied warranty.\n"; + return; +} + +/** "preprocess" the line entered to be able to decide if the command shall be + * executed directly or more input is needed or this is a special command. + * All whitespace will be removed. All comments will be removed. Open and + * close braces ( { and } ) outside strings will be counted. */ +std::string preprocess(char const * const line, bool & comment, bool & single_quote, + bool & double_quote, unsigned & open_braces) +{ + std::string preprocessed; + int pos = 0; + bool end = false; + bool escape = false; + bool slash = false; + bool asterisk = false; while ((line[pos]!='\0')&&!end) { if (escape) { // last character was a \, ignore this one - escape=false; + escape = false; } else if (slash) { // last character was a /, test if * or / - slash=false; + slash = false; if (line[pos]=='/') { - end=true; + end = true; } else if (line[pos]=='*') { - comment=true; + comment = true; } else { preprocessed += '/'; preprocessed += line[pos]; } } else if (asterisk) { // last character was a *, test if / - asterisk=false; + asterisk = false; if (line[pos]=='/') { - comment=false; + comment = false; } else if (line[pos]=='*') { preprocessed += '*'; - asterisk=true; + asterisk = true; } } else { switch (line[pos]) { @@ -251,7 +273,7 @@ string preprocess(char const * const line, bool & comment, bool & single_quote, break; case '\\': // escape character, ignore next - escape=true; + escape = true; break; case '"': if ((!single_quote)&&(!comment)) { @@ -265,33 +287,26 @@ string preprocess(char const * const line, bool & comment, bool & single_quote, break; case '{': if ((!single_quote)&&(!double_quote)&&(!comment)) { - open_braces++; + ++open_braces; } break; case '}': if ((!single_quote)&&(!double_quote)&&(!comment)&&(open_braces>0)) { - open_braces--; + --open_braces; } break; case '/': - slash=true; + slash = true; break; case '*': - asterisk=true; + asterisk = true; break; default: preprocessed += line[pos]; } } - pos++; + ++pos; } - - /* - cout << "preprocessed=" << preprocessed << endl; - cout << "comment=" << comment << ", single_quote=" << single_quote - << ",double_quote=" << double_quote << ", open_braces=" << open_braces - << endl; - */ return preprocessed; } @@ -299,7 +314,8 @@ string preprocess(char const * const line, bool & comment, bool & single_quote, void cleanup(void) { for (cplist::iterator it=filenames.begin(); it!=filenames.end(); ++it) { - cout << "removing file " << *it << endl; + if (!silent) + std::cout << "removing file " << *it << std::endl; remove(*it); free(*it); } @@ -312,9 +328,6 @@ void sigterm_handler(int n) void initialize(void) { - if (isatty(0)) - greeting(); - atexit(cleanup); signal(SIGTERM,sigterm_handler); initialize_cint(); @@ -323,10 +336,7 @@ void initialize(void) void initialize_cint(void) { G__init_cint("cint"); /* initialize cint */ - - // no longer needed as of cint 5.14.31 - // exec_tempfile("#include \n"); - + #ifndef NO_NAMESPACE_GINAC exec_tempfile("using namespace GiNaC;"); #endif // ndef NO_NAMESPACE_GINAC @@ -338,63 +348,117 @@ void initialize_cint(void) void restart(void) { - cout << "Restarting GiNaC-cint." << endl; + std::cout << "Restarting GiNaC-cint." << std::endl; G__scratch_all(); initialize_cint(); } -void redirect(string const & filename) +void redirect(std::string const & filename, + bool shutup=false) { if (filename=="") { - cout << "Redirecting output back to console..." << endl; - exec_tempfile( string() + if (!shutup) + std::cout << "Redirecting output back to console..." << std::endl; + exec_tempfile( std::string() +"ginac_cint_internal_redirect_output=false;\n" +"ginac_cint_internal_fout.close();"); } else { - cout << "Redirecting output to " << filename << "..." << endl; - exec_tempfile( string() + if (!shutup) + std::cout << "Redirecting output to " << filename << "..." << std::endl; + exec_tempfile( std::string() +"ginac_cint_internal_redirect_output=true;\n" +"ginac_cint_internal_fout.open(\""+filename+"\");\n"); } } -bool readlines(istream * is, string & allcommands) +/** Sort out command line options and evaluate them. Returns true if it + * succeeds and false otherwise. */ +bool evaloption(const std::string & option) +{ + if (option=="--version") { + std::cout << "GiNaC-cint (" << PACKAGE << " V" << VERSION + << ", Cint V" << G__CINTVERSION << ")\n"; + exit(0); + } + if (option=="--help") { + std::cout << "GiNaC-cint (" << PACKAGE << " V" << VERSION + << ", Cint V" << G__CINTVERSION << ")\n"; + std::cout << "usage: ginaccint [option] [file ...]\n"; + std::cout << " --help print this help message and exit\n" + << " --silent invoke ginaccint in silent mode\n" + << " --version print GiNaC version and Cint version and exit\n"; + exit(0); + } + if (option=="--silent") { + redirect("/dev/null",true); + silent = true; + return true; + } + return false; +} + +bool is_command(std::string const & command, + std::string & preprocessed, + std::string const & comparevalue, + bool substr) +{ + bool single_quote = false; + bool double_quote = false; + bool comment = false; + unsigned open_braces = 0; + if ((preprocessed=="."+comparevalue)|| + substr&&(preprocessed.substr(0,comparevalue.length()+1)== + "."+comparevalue)) { + return true; + } + if ((command=="//GiNaC-cint."+comparevalue+"\n")|| + substr&&(command.substr(0,comparevalue.length()+13)== + "//GiNaC-cint."+comparevalue)) { + preprocessed = preprocess(command.substr(12).c_str(),comment, + single_quote,double_quote,open_braces); + return true; + } + return false; +} + +bool readlines(istream * is, + std::string & allcommands) { char const * line; char prompt[G__ONELINE]; - string linebuffer; + std::string linebuffer; bool quit = false; bool eof = false; - bool next_command_is_function=false; - bool single_quote=false; - bool double_quote=false; - bool comment=false; - unsigned open_braces=0; + bool next_command_is_function = false; + bool single_quote = false; + bool double_quote = false; + bool comment = false; + unsigned open_braces = 0; while ((!quit)&&(!eof)) { strcpy(prompt,PROMPT1); bool end_of_command = false; - string command; - string preprocessed; + std::string command; + std::string preprocessed; while (!end_of_command) { if (is==NULL) { line = G__input(prompt); } else { getline(*is,linebuffer); - line=linebuffer.c_str(); + line = linebuffer.c_str(); } command += line; command += "\n"; preprocessed += preprocess(line,comment,single_quote,double_quote,open_braces); if ((open_braces==0)&&(!single_quote)&&(!double_quote)&&(!comment)) { - unsigned l=preprocessed.length(); + unsigned l = preprocessed.length(); if ((l==0)|| (preprocessed[0]=='#')|| (preprocessed[0]=='.')|| (preprocessed[l-1]==';')|| (preprocessed[l-1]=='}')) { - end_of_command=true; + end_of_command = true; } } strcpy(prompt,PROMPT2); @@ -402,40 +466,51 @@ bool readlines(istream * is, string & allcommands) if ((preprocessed=="quit;")|| (preprocessed=="exit;")|| (preprocessed=="bye;")|| - (preprocessed==".q")|| - (preprocessed==".quit")|| - (preprocessed==".exit")|| - (preprocessed==".bye")) { + (is_command(command,preprocessed,"quit"))|| + (is_command(command,preprocessed,"exit"))|| + (is_command(command,preprocessed,"bye"))|| + (is_command(command,preprocessed,"q"))) { quit = true; - } else if (preprocessed==".function") { - cout << "next expression can be a function definition" << endl; - next_command_is_function=true; - } else if (preprocessed==".cint") { - cout << endl << "switching to cint interactive mode" << endl; - cout << "'h' for help, 'q' to quit, '{ statements }' or 'p [expression]' to evaluate" << endl; + } else if (is_command(command,preprocessed,"function")) { + if (!silent) + std::cout << "next expression can be a function definition" << std::endl; + next_command_is_function = true; + } else if (is_command(command,preprocessed,"cint")) { + std::cout << std::endl << "switching to cint interactive mode" << std::endl; + std::cout << "'h' for help, 'q' to quit, '{ statements }' or 'p [expression]' to evaluate" << std::endl; G__pause(); - cout << "back from cint" << endl; - } else if (preprocessed==".help") { + std::cout << "back from cint" << std::endl; + } else if (is_command(command,preprocessed,"help")) { helpmessage(); - } else if (preprocessed.substr(0,5)==".read") { - quit=readfile(preprocessed.substr(5),allcommands); - } else if (preprocessed.substr(0,5)==".save") { - command = "// "+command; // we do not want the .save command itself in saved files + } else if (is_command(command,preprocessed,"read",true)) { + quit = readfile(preprocessed.substr(5),allcommands); + } else if (is_command(command,preprocessed,"save",true)) { + command = "/* "+command+" */"; // we do not want the .save command itself in saved files savefile(preprocessed.substr(5),allcommands); - } else if (preprocessed==".restart") { + } else if (is_command(command,preprocessed,"restart")) { restart(); - } else if (preprocessed.substr(0,9)==".redirect") { + } else if (is_command(command,preprocessed,"redirect",true)) { redirect(preprocessed.substr(9)); - } else if (preprocessed.substr(0,2)==".>") { + } else if (is_command(command,preprocessed,">",true)) { redirect(preprocessed.substr(2)); - } else if (preprocessed==".silent") { - redirect("/dev/null"); + } else if (is_command(command,preprocessed,"silent")) { + if (!silent) { + redirect("/dev/null"); + silent = true; + } else { + redirect(""); + silent = false; + } + } else if (is_command(command,preprocessed,"warranty")) { + warrantymessage(); /* test for more special commands } else if (preprocessed==".xyz") { - cout << "special command (TBD): " << command << endl; + std::cout << "special command (TBD): " << command << std::endl; */ + } else if (command.substr(0,2)=="#!") { + // ignore lines which indicate that this file is executed as a script } else { - // cout << "now processing: " << command << endl; + // std::cout << "now processing: " << command << std::endl; if (next_command_is_function) { next_command_is_function = false; filenames.push_back(process_permanentfile(command)); @@ -445,7 +520,7 @@ bool readlines(istream * is, string & allcommands) } if (is!=NULL) { // test for end of file if reading from a stream - eof=is->eof(); + eof = is->eof(); } else { // save commands only when reading from keyboard allcommands += command; @@ -455,71 +530,73 @@ bool readlines(istream * is, string & allcommands) return quit; } -bool readfile(string const & filename, string & allcommands) +bool readfile(std::string const & filename, + std::string & allcommands, + bool shutup = false) { - cout << "Reading commands from file " << filename << "." << endl; - bool quit=false; - ifstream fin; + if (!shutup) + std::cout << "Reading commands from file " << filename << "." << std::endl; + bool quit = false; + std::ifstream fin; fin.open(filename.c_str()); - if (fin.good()) { - quit=readlines(&fin,allcommands); - } else { - cout << "Cannot open " << filename << " for reading." << endl; - } + if (fin.good()) + quit = readlines(&fin,allcommands); + else + std::cout << "Cannot open " << filename << " for reading." << std::endl; fin.close(); return quit; } -void savefile(string const & filename, string const & allcommands) +void savefile(std::string const & filename, std::string const & allcommands) { - cout << "Saving commands to file " << filename << "." << endl; - ofstream fout; + std::cout << "Saving commands to file " << filename << "." << std::endl; + std::ofstream fout; fout.open(filename.c_str()); if (fout.good()) { fout << allcommands; if (!fout.good()) { - cout << "Cannot save commands to " << filename << "." << endl; + std::cout << "Cannot save commands to " << filename << "." << std::endl; } } else { - cout << "Cannot open " << filename << " for writing." << endl; + std::cout << "Cannot open " << filename << " for writing." << std::endl; } fout.close(); } -int main(int argc, char ** argv) +int main(int argc, char * *argv) { - string allcommands; + std::string allcommands; initialize(); - - bool quit=false; - bool argsexist=argc>1; - - if (argsexist) { - allcommands="/* Files given as command line arguments:\n"; - } - argc--; argv++; - while (argc && !quit) { - allcommands += *argv; - allcommands += "\n"; - quit=readfile(*argv,allcommands); - argc--; argv++; - } - + bool quit = false; + // sort out and evaluate recognized options from the argument list + for (int i=1; i1; + + // greet the user if it makes sense + if (isatty(0) && !silent) + greeting(); + + // evaluate files given as command line arguments if (argsexist) { + allcommands = "/* Files given as command line arguments:\n"; + --argc; + while (argc && !quit) { + allcommands += std::string(argv[argc])+'\n'; + quit = readfile(argv[argc], allcommands, silent); + --argc; + } allcommands += "*/\n"; } - - if (!quit) { - readlines(NULL,allcommands); - } - + + // evaluate input from command line or script + if (!quit) + readlines(NULL, allcommands); + return 0; } - - - - - - -