Parse (but ignore) ECMAScript 6 "spread elements".

[cycript.git] / Driver.cpp

diff --git a/Driver.cpp b/Driver.cpp
index 4b1286c58de9010e32273892036ac17e8ebf91db..387a46d679fe24b600b43b7b041264f6ec082fa7 100644 (file)
--- a/Driver.cpp
+++ b/Driver.cpp
@@ -1,40 +1,44 @@
 /* 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/>.

 **/
 /* }}} */
 
 #include "Cycript.tab.hh"
 #include "Driver.hpp"
 
 **/
 /* }}} */
 
 #include "Cycript.tab.hh"
 #include "Driver.hpp"
 

-CYDriver::CYDriver(std::istream &data, const std::string &filename) :
-    state_(CYClear),
+CYDriver::CYDriver(CYPool &pool, std::istream &data, const std::string &filename) :
+    pool_(pool),
+    newline_(false),
+    last_(false),

     data_(data),
     data_(data),

+    debug_(0),

     strict_(false),
     strict_(false),

-    commented_(false),
+    highlight_(false),

     filename_(filename),
     filename_(filename),

-    program_(NULL),
+    script_(NULL),

     auto_(false),
     context_(NULL),
     mode_(AutoNone)
 {
     memset(&no_, 0, sizeof(no_));
     in_.push(false);
     auto_(false),
     context_(NULL),
     mode_(AutoNone)
 {
     memset(&no_, 0, sizeof(no_));
     in_.push(false);

+    template_.push(false);

     ScannerInit();
 }
 
     ScannerInit();
 }
 


@@ -42,7 +46,22 @@ CYDriver::~CYDriver() {
     ScannerDestroy();
 }
 
     ScannerDestroy();
 }
 

-void CYDriver::Warning(const cy::location &location, const char *message) {
+bool CYDriver::Parse() {
+    CYLocal<CYPool> local(&pool_);
+    cy::parser parser(*this);
+#ifdef YYDEBUG
+    parser.set_debug_level(debug_);
+#endif
+    return parser.parse() != 0;
+}
+
+void CYDriver::Replace(CYOptions &options) {
+    CYLocal<CYPool> local(&pool_);
+    CYContext context(options);
+    script_->Replace(context);
+}
+
+void CYDriver::Warning(const cy::parser::location_type &location, const char *message) {

     if (!strict_)
         return;
 
     if (!strict_)
         return;