Cast NSUInteger arguments to size_t for %zu format.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 7197428bfe112e27d83b4b26ef43205005670f63..c9614ed604a6e734f09e711b451fa4fc952ff906 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -39,7 +39,7 @@
 #include "Pooling.hpp"
 #include "Options.hpp"
 
-class CYContext;
+struct CYContext;
 
 struct CYThing {
     virtual ~CYThing() {
@@ -350,11 +350,14 @@ struct CYProgram :
 };
 
 struct CYNonLocal;
+struct CYThisScope;
 
 struct CYContext {
     CYOptions &options_;
 
     CYScope *scope_;
+    CYThisScope *this_;
+
     CYIdentifierUsageVector rename_;
 
     CYNonLocal *nonlocal_;
@@ -364,6 +367,7 @@ struct CYContext {
     CYContext(CYOptions &options) :
         options_(options),
         scope_(NULL),
+        this_(NULL),
         nonlocal_(NULL),
         nextlocal_(NULL),
         unique_(0)
@@ -414,6 +418,25 @@ struct CYNonLocal {
     }
 };
 
+struct CYThisScope :
+    CYNext<CYThisScope>
+{
+    CYIdentifier *identifier_;
+
+    CYThisScope() :
+        identifier_(NULL)
+    {
+    }
+
+    CYIdentifier *Identifier(CYContext &context) {
+        if (next_ != NULL)
+            return next_->Identifier(context);
+        if (identifier_ == NULL)
+            identifier_ = context.Unique();
+        return identifier_;
+    }
+};
+
 struct CYBlock :
     CYStatement,
     CYThing
@@ -430,7 +453,7 @@ struct CYBlock :
     }
 
     void AddPrev(CYStatement *statement) {
-        CYSetLast(statement, statements_);
+        CYSetLast(statement) = statements_;
         statements_ = statement;
     }
 
@@ -446,19 +469,44 @@ enum CYState {
     CYNewLine
 };
 
+class CYStream :
+    public std::istream
+{
+  private:
+    class CYBuffer :
+        public std::streambuf
+    {
+      public:
+        CYBuffer(const char *start, const char *end) {
+            setg(const_cast<char *>(start), const_cast<char *>(start), const_cast<char *>(end));
+        }
+    } buffer_;
+
+  public:
+    CYStream(const char *start, const char *end) :
+        std::istream(&buffer_),
+        buffer_(start, end)
+    {
+    }
+};
+
 class CYDriver {
   public:
     void *scanner_;
 
     CYState state_;
-    bool nobrace_;
     std::stack<bool> in_;
 
-    const char *data_;
-    size_t size_;
-    FILE *file_;
+    struct {
+        bool AtImplementation;
+        bool Function;
+        bool OpenBrace;
+    } no_;
+
+    std::istream &data_;
 
     bool strict_;
+    bool commented_;
 
     enum Condition {
         RegExpCondition,
@@ -511,7 +559,7 @@ class CYDriver {
     void ScannerDestroy();
 
   public:
-    CYDriver(const std::string &filename = "");
+    CYDriver(std::istream &data, const std::string &filename = "");
     ~CYDriver();
 
     Condition GetCondition();
@@ -619,7 +667,7 @@ struct CYCompound :
     }
 
     void AddPrev(CYExpression *expression) {
-        CYSetLast(expression, expressions_);
+        CYSetLast(expression) = expressions_;
         expressions_ = expression;
     }
 
@@ -653,6 +701,11 @@ struct CYComprehension :
     CYNext<CYComprehension>,
     CYThing
 {
+    CYComprehension(CYComprehension *next = NULL) :
+        CYNext<CYComprehension>(next)
+    {
+    }
+
     virtual const char *Name() const = 0;
 
     virtual CYFunctionParameter *Parameter(CYContext &context) const = 0;
@@ -667,7 +720,8 @@ struct CYForInComprehension :
     CYIdentifier *name_;
     CYExpression *set_;
 
-    CYForInComprehension(CYIdentifier *name, CYExpression *set) :
+    CYForInComprehension(CYIdentifier *name, CYExpression *set, CYComprehension *next = NULL) :
+        CYComprehension(next),
         name_(name),
         set_(set)
     {
@@ -688,7 +742,8 @@ struct CYForOfComprehension :
     CYIdentifier *name_;
     CYExpression *set_;
 
-    CYForOfComprehension(CYIdentifier *name, CYExpression *set) :
+    CYForOfComprehension(CYIdentifier *name, CYExpression *set, CYComprehension *next = NULL) :
+        CYComprehension(next),
         name_(name),
         set_(set)
     {
@@ -1475,7 +1530,9 @@ struct CYFunction {
     CYIdentifier *name_;
     CYFunctionParameter *parameters_;
     CYBlock code_;
+
     CYNonLocal *nonlocal_;
+    CYThisScope this_;
 
     CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
         name_(name),
@@ -1510,6 +1567,23 @@ struct CYFunctionExpression :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
+// XXX: this should derive from CYAnonymousFunction
+struct CYFatArrow :
+    CYFunction,
+    CYExpression
+{
+    CYFatArrow(CYFunctionParameter *parameters, CYStatement *statements) :
+        CYFunction(NULL, parameters, statements)
+    {
+    }
+
+    CYPrecedence(0)
+    CYRightHand(false)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
 // XXX: this should derive from CYAnonymousFunctionExpression
 struct CYRubyProc :
     CYFunctionExpression