Move all "regular" LexPushInOff/LexPopIn to lexer.

[cycript.git] / cycript.hpp

diff --git a/cycript.hpp b/cycript.hpp
index e9284e787f599fa39b79d3d60649620a8a4daebb..a70cd9496e604ef850ed2dd65e361323b2bbef51 100644 (file)
--- a/cycript.hpp
+++ b/cycript.hpp
@@ -1,34 +1,33 @@
 /* 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
- * 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/>.
 **/
 /* }}} */
 
 #ifndef CYCRIPT_HPP
 #define CYCRIPT_HPP
 
-#include <apr_pools.h>
-#include <sig/types.hpp>
 #include <sstream>
 
-#include "String.hpp"
+#include <sig/types.hpp>
 
-void CYInitializeStatic();
+#include "Pooling.hpp"
+#include "String.hpp"
 
 bool CYRecvAll_(int socket, uint8_t *data, size_t size);
 bool CYSendAll_(int socket, const uint8_t *data, size_t size);
@@ -39,7 +38,7 @@ void CYStringify(std::ostringstream &str, const char *data, size_t size);
 double CYCastDouble(const char *value, size_t size);
 double CYCastDouble(const char *value);
 
-extern "C" void CYHandleClient(apr_pool_t *pool, int socket);
+void CYHandleClient(int socket);
 
 template <typename Type_>
 bool CYRecvAll(int socket, Type_ *data, size_t size) {
@@ -51,6 +50,8 @@ bool CYSendAll(int socket, const Type_ *data, size_t size) {
     return CYSendAll_(socket, reinterpret_cast<const uint8_t *>(data), size);
 }
 
-apr_pool_t *CYGetGlobalPool();
+CYPool &CYGetGlobalPool();
+
+char **CYComplete(const char *word, const std::string &line, CYUTF8String (*run)(CYPool &pool, const std::string &));
 
 #endif/*CYCRIPT_HPP*/