Make Type inherit Functin and build placement new.

[cycript.git] / Highlight.hpp

diff --git a/Highlight.hpp b/Highlight.hpp
index a3eae0c0d7af6aad7c4c14dc6f25a83e569c7076..72c369a58b8af898acd7328a5d6c87ee368927ba 100644 (file)
--- a/Highlight.hpp
+++ b/Highlight.hpp
@@ -1,21 +1,21 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

 */
 
 */
 

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

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


@@ -28,15 +28,19 @@ namespace hi { enum Value {
     Comment,
     Constant,
     Control,
     Comment,
     Constant,
     Control,

-    Escape,
+    Error,

     Identifier,
     Meta,
     Nothing,
     Operator,
     Identifier,
     Meta,
     Nothing,
     Operator,

+    Special,

     Structure,
     Type,
 }; }
 
     Structure,
     Type,
 }; }
 

-void CYLexerHighlight(const char *data, size_t size, std::ostream &output);
+void CYLexerHighlight(const char *data, size_t size, std::ostream &output, bool ignore = false);
+
+const char CYIgnoreStart = '\x01';
+const char CYIgnoreEnd = '\x02';

 
 #endif/*CYCRIPT_HIGHLIGHT_HPP*/
 
 #endif/*CYCRIPT_HIGHLIGHT_HPP*/