Tab-completer accidentally overwrote name variable.

[cycript.git] / Highlight.cpp

diff --git a/Highlight.cpp b/Highlight.cpp
index e5a476d2e31b27a89784fa395f6bd4bb294549a7..4cfc8db26a60bc93d0bc5d08dd6bf9356eba7dad 100644 (file)
--- a/Highlight.cpp
+++ b/Highlight.cpp
@@ -20,9 +20,10 @@
 /* }}} */
 
 #include "Highlight.hpp"
 /* }}} */
 
 #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) {


@@ -73,11 +74,12 @@ 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;