Use MACHINE_THREAD_STATE{,_COUNT} to simplify Mach.

[cycript.git] / Highlight.cpp

diff --git a/Highlight.cpp b/Highlight.cpp
index 371722e5e0659efede1c69df89e165071fdc76d6..e5a476d2e31b27a89784fa395f6bd4bb294549a7 100644 (file)
--- a/Highlight.cpp
+++ b/Highlight.cpp
@@ -1,20 +1,20 @@
 /* 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/>.
 **/
 /* }}} */
@@ -53,9 +53,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);
+    driver.commented_ = true;
 
     size_t offset(0);
     cy::position current;
@@ -79,14 +80,30 @@ void CYLexerHighlight(const char *data, size_t size, std::ostream &output) {
             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);
-        if (color.code_ != 0)
+
+        if (color.code_ != 0) {
+            if (ignore)
+                output << CYIgnoreStart;
             output << "\e[" << (color.bold_ ? '1' : '0') << ";" << color.code_ << "m";
+            if (ignore)
+                output << CYIgnoreEnd;
+        }
+
         Skip(data, size, output, offset, current, location.end);
-        if (color.code_ != 0)
+
+        if (color.code_ != 0) {
+            if (ignore)
+                output << CYIgnoreStart;
             output << "\e[0m";
+            if (ignore)
+                output << CYIgnoreEnd;
+        }
     }
 
     output.write(data + offset, size - offset);