Allow Type objects to have associated identifiers.

[cycript.git] / Parser.cpp

diff --git a/Parser.cpp b/Parser.cpp
index b53aee117c158a81aeaddf907001ae0b25cc4028..09aaf7a93d26815f087ad81a347b31a4ccf01655 100644 (file)
--- a/Parser.cpp
+++ b/Parser.cpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2012  Jay Freeman (saurik)
 */
 
 /* GNU Lesser General Public License, Version 3 {{{ */
@@ -26,19 +26,18 @@ CYRange DigitRange_    (0x3ff000000000000LLU, 0x000000000000000LLU); // 0-9
 CYRange WordStartRange_(0x000001000000000LLU, 0x7fffffe87fffffeLLU); // A-Za-z_$
 CYRange WordEndRange_  (0x3ff001000000000LLU, 0x7fffffe87fffffeLLU); // A-Za-z_$0-9
 
-CYDriver::CYDriver(const std::string &filename) :
+CYDriver::CYDriver(std::istream &data, const std::string &filename) :
     state_(CYClear),
-    nobrace_(false),
-    data_(NULL),
-    size_(0),
-    file_(NULL),
+    data_(data),
     strict_(false),
+    commented_(false),
     filename_(filename),
     program_(NULL),
     auto_(false),
     context_(NULL),
     mode_(AutoNone)
 {
+    memset(&no_, 0, sizeof(no_));
     in_.push(false);
     ScannerInit();
 }