Put the filename in _trace to make it more useful.

[cycript.git] / Highlight.cpp

diff --git a/Highlight.cpp b/Highlight.cpp
index 750516775fa06f44b039373ef4f0cc996e6a6c25..fd9cfe6b573288e2c4ee4e63f19f8f0755d7c2aa 100644 (file)
--- a/Highlight.cpp
+++ b/Highlight.cpp
@@ -1,30 +1,32 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

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

 */
 
 */
 

-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU Affero 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 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.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program 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 Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 **/
 /* }}} */
 
 #include "Highlight.hpp"
 **/
 /* }}} */
 
 #include "Highlight.hpp"

+#include "Parser.hpp"

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

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

 
 

-static void Skip(const char *data, size_t size, std::ostream &output, size_t &offset, cy::position &current, cy::position target) {
+static void Skip(const char *data, size_t size, std::ostream &output, size_t &offset, CYPosition &current, CYPosition target) {

     while (current.line != target.line || current.column != target.column) {
         _assert(offset != size);
         char next(data[offset++]);
     while (current.line != target.line || current.column != target.column) {
         _assert(offset != size);
         char next(data[offset++]);


@@ -56,14 +58,15 @@ struct CYColor {
 void CYLexerHighlight(const char *data, size_t size, std::ostream &output, bool ignore) {
     CYStream stream(data, data + size);
     CYDriver driver(stream);
 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);
 
     size_t offset(0);

-    cy::position current;
+    CYPosition current;

 
     CYLocalPool pool;
 
     YYSTYPE value;
 
     CYLocalPool pool;
 
     YYSTYPE value;

-    cy::location location;
+    CYLocation location;

 
     while (cylex(&value, &location, driver.scanner_) != 0) {
         CYColor color;
 
     while (cylex(&value, &location, driver.scanner_) != 0) {
         CYColor color;


@@ -72,13 +75,17 @@ void CYLexerHighlight(const char *data, size_t size, std::ostream &output, bool
             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::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::Special: color = CYColor(false, 35); break;

             case hi::Structure: color = CYColor(true, 34); break;
             case hi::Type: color = CYColor(true, 34); 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);