Require strings used as characters to be one byte.

[cycript.git] / Highlight.cpp

diff --git a/Highlight.cpp b/Highlight.cpp
index fd9cfe6b573288e2c4ee4e63f19f8f0755d7c2aa..a2926d3a51d2b539e45f7019614126baf8062059 100644 (file)
--- a/Highlight.cpp
+++ b/Highlight.cpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2015  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -19,12 +19,11 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

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

 #include "Highlight.hpp"
 #include "Highlight.hpp"

-#include "Parser.hpp"

 
 

-#include "Cycript.tab.hh"
-#include "Driver.hpp"
-#include "Code.hpp"
+bool CYLexerHighlight(hi::Value &highlight, CYLocation &location, void *scanner);

 
 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) {
 
 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) {


@@ -35,9 +34,9 @@ static void Skip(const char *data, size_t size, std::ostream &output, size_t &of
 
         _assert(current.line < target.line || current.line == target.line && current.column < target.column);
         if (next == '\n')
 
         _assert(current.line < target.line || current.line == target.line && current.column < target.column);
         if (next == '\n')

-            current.lines();
+            current.Lines();

         else
         else

-            current.columns();
+            current.Columns();

     }
 }
 
     }
 }
 


@@ -55,23 +54,23 @@ struct CYColor {
     }
 };
 
     }
 };
 

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

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

-    CYDriver driver(stream);
-    driver.commented_ = true;
+    CYDriver driver(pool, stream);
+    driver.highlight_ = true;

 
     size_t offset(0);
     CYPosition current;
 
 
     size_t offset(0);
     CYPosition current;
 

-    CYLocalPool pool;
-
-    YYSTYPE value;
+    hi::Value highlight;

     CYLocation location;
 
     CYLocation location;
 

-    while (cylex(&value, &location, driver.scanner_) != 0) {
+    while (CYLexerHighlight(highlight, location, driver.scanner_)) {

         CYColor color;
 
         CYColor color;
 

-        switch (value.highlight_) {
+        switch (highlight) {

             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;