Attach FFI closure deallocation to Functor's pool.

[cycript.git] / Highlight.cpp

diff --git a/Highlight.cpp b/Highlight.cpp
index 73814ec597759c14ad8e0fa7abbd6411a40c128b..d668f78ff27d215fce9c6309493d7713e01428c5 100644 (file)
--- a/Highlight.cpp
+++ b/Highlight.cpp
@@ -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) {
@@ -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')
-            current.lines();
+            current.Lines();
         else
-            current.columns();
+            current.Columns();
     }
 }
 
@@ -56,22 +55,22 @@ struct CYColor {
 };
 
 _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;