Simplify CYScope's declaration by embracing Close.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 9e84912f8a9b2b6e6d8b2bbd674fe1ac6b14338b..883f03f0977cbf5b13e150f2b3765e7de73fe297 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -85,7 +85,8 @@ static void sigint(int) {
         case Parsing:
             longjmp(ctrlc_, 1);
         case Running:
         case Parsing:
             longjmp(ctrlc_, 1);
         case Running:

-            throw "*** Ctrl-C";
+            CYCancel();
+            return;

         case Sending:
             return;
         case Waiting:
         case Sending:
             return;
         case Waiting:


@@ -386,7 +387,7 @@ static char **Complete(const char *word, int start, int end) {
 
 // need char *, not const char *
 static char name_[] = "cycript";
 
 // need char *, not const char *
 static char name_[] = "cycript";

-static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]";
+static char break_[] = " \t\n\"\\'`@><=;|&{(" ")}" ".:[]";

 
 class History {
   private:
 
 class History {
   private: