Fix support for multiple "block lambda" arguments.

[cycript.git] / Highlight.cpp

diff --git a/Highlight.cpp b/Highlight.cpp
index ef3632fc9df3b9dc2336844c48cbecc66e74abd7..addd757ec19f3cc47e14d02061441cd4626ea493 100644 (file)
--- a/Highlight.cpp
+++ b/Highlight.cpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -19,12 +19,11 @@
 **/
 /* }}} */
 
+#include "Code.hpp"
+#include "Driver.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) {
@@ -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);
-    CYDriver driver(stream);
-    driver.commented_ = true;
+    CYDriver driver(pool, stream);
+    driver.highlight_ = true;
 
     size_t offset(0);
     CYPosition current;
 
-    CYLocalPool pool;
-
-    YYSTYPE value;
+    hi::Value highlight;
     CYLocation location;
 
-    while (cylex(&value, &location, driver.scanner_) != 0) {
+    while (CYLexerHighlight(highlight, location, driver.scanner_)) {
         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;