Changes to parser.

src/main.cpp

@@ -5,18 +5,25 @@
 // http://www.chaiscript.com
 
 #include <iostream>
-
 #include <list>
-
 #define _CRT_SECURE_NO_WARNINGS
+#include <chaiscript/chaiscript.hpp>
 
 #ifdef READLINE_AVAILABLE
 #include <readline/readline.h>
 #include <readline/history.h>
+#else
+static char* readline(const char* p)
+{
+  std::string retval;
+  std::cout << p ;
+  std::getline(std::cin, retval);
+  return std::cin.eof() ? NULL : _strdup(retval.c_str());
+}
+static void add_history(const char*){}
+static void using_history(){}
 #endif
 
-#include <chaiscript/chaiscript.hpp>
-
 void print_help() {
   std::cout << "ChaiScript evaluator.  To evaluate an expression, type it and press <enter>." << std::endl;
   std::cout << "Additionally, you can inspect the runtime system using:" << std::endl;
@@ -24,7 +31,6 @@ void print_help() {
   std::cout << "  dump_object(x) - dumps information about the given symbol" << std::endl;
 }
 
-
 bool throws_exception(const chaiscript::Proxy_Function &f)
 {
   try {
@@ -36,112 +42,106 @@ bool throws_exception(const chaiscript::Proxy_Function &f)
   return false;
 }
 
-
 std::string get_next_command() {
-#ifdef READLINE_AVAILABLE
-  char *input_raw;
-  input_raw = readline("eval> ");
-  add_history(input_raw);
-  return std::string(input_raw);
-#else
-  std::string retval;
-  std::cout << "eval> ";
-  std::getline(std::cin, retval);
+  std::string retval("quit");
+  if ( ! std::cin.eof() ) {
+    char *input_raw = readline("eval> ");
+    if ( input_raw ) {
+      add_history(input_raw);
+      retval = input_raw;
+      ::free(input_raw);
+      if ( retval == "help" ) {
+         print_help();
+         retval="";
+      }
+      if ( retval == "quit" || retval == "exit" ) {
+        retval="exit(0)";
+      }
+    }
+  }
   return retval;
-#endif
 }
 
 // We have to wrap exit with our own because Clang has a hard time with
 // function pointers to functions with special attributes (system exit being marked NORETURN)
 void myexit(int return_val) {
+  std::cout << "thanks for using ChaiScript" << std::endl ;
   exit(return_val);
 }
 
-int main(int argc, char *argv[]) {
-  std::string input;
+void interactive(chaiscript::ChaiScript& chai)
+{
+  using_history();
+
+  for (;;) {
+    std::string input = get_next_command();
+    try {
+      // evaluate input
+      chaiscript::Boxed_Value val = chai.eval(input);
+
+      //Then, we try to print the result of the evaluation to the user
+      if (!val.get_type_info().bare_equal(chaiscript::user_type<void>())) {
+        try {
+          chaiscript::dispatch(chai.get_eval_engine().get_function("print"), chaiscript::Param_List_Builder() << val);
+        }
+        catch (...) {} //If we can't, do nothing
+      }
+    }
+    catch (chaiscript::Eval_Error &ee) {
+      std::cout << ee.what();
+      if (ee.call_stack.size() > 0) {
+        std::cout << "during evaluation at (" << ee.call_stack[0]->start.line << ", " << ee.call_stack[0]->start.column << ")";
+      }
+      std::cout << std::endl;
+    }
+    catch (std::exception &e) {
+      std::cout << e.what();
+      std::cout << std::endl;
+    }
+  }
+}
+
+int main(int argc, char *argv[])
+{
+  int error = EXIT_SUCCESS;
 
   std::vector<std::string> usepaths;
   std::vector<std::string> modulepaths;
 
-
   // Disable deprecation warning for getenv call.
-#ifdef BOOST_MSVC
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#endif
+  #ifdef BOOST_MSVC
+  #pragma warning(push)
+  #pragma warning(disable : 4996)
+  #endif
 
   const char *usepath = getenv("CHAI_USE_PATH");
   const char *modulepath = getenv("CHAI_MODULE_PATH");
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
+  #ifdef BOOST_MSVC
+  #pragma warning(pop)
+  #endif
 
   usepaths.push_back("");
-
   if (usepath)
   {
     usepaths.push_back(usepath);
   }
 
   modulepaths.push_back("");
-
   if (modulepath)
   {
     modulepaths.push_back(modulepath);
   }
 
-
   chaiscript::ChaiScript chai(modulepaths,usepaths);
 
   chai.add(chaiscript::fun(&myexit), "exit");
   chai.add(chaiscript::fun(&throws_exception), "throws_exception");
 
   if (argc < 2) {
-#ifdef READLINE_AVAILABLE
-    using_history();
-#endif
-    input = get_next_command();
-    while (input != "quit") {
-
-      chaiscript::Boxed_Value val;
-
-      if (input == "help") {
-        print_help();
-      }
-      else {
-        try {
-          //First, we evaluate it
-          val = chai.eval(input);
-
-          //Then, we try to print the result of the evaluation to the user
-          if (!val.get_type_info().bare_equal(chaiscript::user_type<void>())) {
-            try {
-              chaiscript::dispatch(chai.get_eval_engine().get_function("print"), chaiscript::Param_List_Builder() << val);
-            }
-            catch (...) {
-              //If we can't, do nothing
-            }
-          }
-        }
-        catch (chaiscript::Eval_Error &ee) {
-          std::cout << ee.what();
-          if (ee.call_stack.size() > 0) {
-            std::cout << "during evaluation at (" << ee.call_stack[0]->start.line << ", " << ee.call_stack[0]->start.column << ")";
-          }
-          std::cout << std::endl;
-        }
-        catch (std::exception &e) {
-          std::cout << e.what();
-          std::cout << std::endl;
-        }
-      }
-
-      input = get_next_command();
-    }
-  }
-  else {
-    for (int i = 1; i < argc; ++i) {
+    interactive(chai);
+  } else {
+    for (int i = 1; !error && (i < argc); ++i) {
       try {
         chaiscript::Boxed_Value val = chai.eval_file(argv[i]);
       }
@@ -155,15 +155,15 @@ int main(int argc, char *argv[]) {
           }
         }
         std::cout << std::endl;
-        return EXIT_FAILURE;
+        error = EXIT_FAILURE;
       }
       catch (std::exception &e) {
         std::cout << e.what() << std::endl;
-        return EXIT_FAILURE;
+        error = EXIT_FAILURE;
       }
     }
   }
 
-  return EXIT_SUCCESS;
+  return error ;
 }