Maybe thread local storage is a performance issue.

[cycript.git] / Highlight.cpp

diff --git a/Highlight.cpp b/Highlight.cpp
index 4cfc8db26a60bc93d0bc5d08dd6bf9356eba7dad..3e8aa7bff1ed90b4091c487d3956193be9bbef79 100644 (file)
--- a/Highlight.cpp
+++ b/Highlight.cpp
@@ -1,21 +1,21 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

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

 */
 
 */
 

-/* GNU 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 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
+ * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/>.

 **/
 /* }}} */
 
 **/
 /* }}} */
 


@@ -24,8 +24,9 @@
 
 #include "Cycript.tab.hh"
 #include "Driver.hpp"
 
 #include "Cycript.tab.hh"
 #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++]);


@@ -54,18 +55,18 @@ 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);
+    CYDriver driver(pool, stream);

     driver.commented_ = true;
 
     size_t offset(0);
     driver.commented_ = true;
 
     size_t offset(0);

-    cy::position current;
-
-    CYLocalPool pool;
+    CYPosition current;

 
     YYSTYPE value;
 
     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;