Try (and almost fail) to compile armv6 on -mthumb.

[cycript.git] / Highlight.cpp

diff --git a/Highlight.cpp b/Highlight.cpp
index 371722e5e0659efede1c69df89e165071fdc76d6..0a077a8a7b58f0bb6bc43184f944508f627c85b1 100644 (file)
--- a/Highlight.cpp
+++ b/Highlight.cpp
@@ -1,28 +1,29 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */

 /*
 /*

- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.

  *
  *

- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.

  *
  *

- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License

  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
 
 #include "Highlight.hpp"
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
 
 #include "Highlight.hpp"

+#include "Parser.hpp"

 
 #include "Cycript.tab.hh"
 
 #include "Cycript.tab.hh"

-#include "Parser.hpp"
+#include "Driver.hpp"

 
 static void Skip(const char *data, size_t size, std::ostream &output, size_t &offset, cy::position &current, cy::position target) {
     while (current.line != target.line || current.column != target.column) {
 
 static void Skip(const char *data, size_t size, std::ostream &output, size_t &offset, cy::position &current, cy::position target) {
     while (current.line != target.line || current.column != target.column) {


@@ -53,9 +54,10 @@ struct CYColor {
     }
 };
 
     }
 };
 

-void CYLexerHighlight(const char *data, size_t size, std::ostream &output) {
+void CYLexerHighlight(const char *data, size_t size, std::ostream &output, bool ignore) {

     CYStream stream(data, data + size);
     CYDriver driver(stream);
     CYStream stream(data, data + size);
     CYDriver driver(stream);

+    driver.commented_ = true;

 
     size_t offset(0);
     cy::position current;
 
     size_t offset(0);
     cy::position current;


@@ -72,21 +74,37 @@ void CYLexerHighlight(const char *data, size_t size, std::ostream &output) {
             case hi::Comment: color = CYColor(true, 30); break;
             case hi::Constant: color = CYColor(false, 31); break;
             case hi::Control: color = CYColor(false, 33); break;
             case hi::Comment: color = CYColor(true, 30); break;
             case hi::Constant: color = CYColor(false, 31); break;
             case hi::Control: color = CYColor(false, 33); break;

-            case hi::Escape: color = CYColor(true, 31); break;
+            case hi::Error: color = CYColor(true, 31); break;

             case hi::Identifier: color = CYColor(false, 0); break;
             case hi::Meta: color = CYColor(false, 32); break;
             case hi::Nothing: color = CYColor(false, 0); break;
             case hi::Operator: color = CYColor(false, 36); break;
             case hi::Structure: color = CYColor(true, 34); break;
             case hi::Type: color = CYColor(true, 34); break;
             case hi::Identifier: color = CYColor(false, 0); break;
             case hi::Meta: color = CYColor(false, 32); break;
             case hi::Nothing: color = CYColor(false, 0); break;
             case hi::Operator: color = CYColor(false, 36); break;
             case hi::Structure: color = CYColor(true, 34); break;
             case hi::Type: color = CYColor(true, 34); break;

+
+            // XXX: maybe I should use nodefault here?
+            default: color = CYColor(true, 0); break;

         }
 
         Skip(data, size, output, offset, current, location.begin);
         }
 
         Skip(data, size, output, offset, current, location.begin);

-        if (color.code_ != 0)
+
+        if (color.code_ != 0) {
+            if (ignore)
+                output << CYIgnoreStart;

             output << "\e[" << (color.bold_ ? '1' : '0') << ";" << color.code_ << "m";
             output << "\e[" << (color.bold_ ? '1' : '0') << ";" << color.code_ << "m";

+            if (ignore)
+                output << CYIgnoreEnd;
+        }
+

         Skip(data, size, output, offset, current, location.end);
         Skip(data, size, output, offset, current, location.end);

-        if (color.code_ != 0)
+
+        if (color.code_ != 0) {
+            if (ignore)
+                output << CYIgnoreStart;

             output << "\e[0m";
             output << "\e[0m";

+            if (ignore)
+                output << CYIgnoreEnd;
+        }

     }
 
     output.write(data + offset, size - offset);
     }
 
     output.write(data + offset, size - offset);