{Functor,Selector}.type should return @encode().

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 57dd99356686e7405039f4cfa17c6777bf365ca8..e68cf1a57b7ea4b1eb84bb375cd095c3ba964232 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU 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 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 MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
+ * 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 General Public License for more details.

  *
  *

- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License

  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */


@@ -24,7 +24,6 @@
 
 #include <iostream>
 
 
 #include <iostream>
 

-#include <stack>

 #include <string>
 #include <vector>
 #include <map>
 #include <string>
 #include <vector>
 #include <map>


@@ -33,13 +32,11 @@
 #include <cstdio>
 #include <cstdlib>
 
 #include <cstdio>
 #include <cstdlib>
 

-#include "location.hh"
-

 #include "List.hpp"
 #include "Pooling.hpp"
 #include "Options.hpp"
 
 #include "List.hpp"
 #include "Pooling.hpp"
 #include "Options.hpp"
 

-class CYContext;
+struct CYContext;

 
 struct CYThing {
     virtual ~CYThing() {
 
 struct CYThing {
     virtual ~CYThing() {


@@ -350,11 +347,14 @@ struct CYProgram :
 };
 
 struct CYNonLocal;
 };
 
 struct CYNonLocal;

+struct CYThisScope;

 
 struct CYContext {
     CYOptions &options_;
 
     CYScope *scope_;
 
 struct CYContext {
     CYOptions &options_;
 
     CYScope *scope_;

+    CYThisScope *this_;
+

     CYIdentifierUsageVector rename_;
 
     CYNonLocal *nonlocal_;
     CYIdentifierUsageVector rename_;
 
     CYNonLocal *nonlocal_;


@@ -364,6 +364,7 @@ struct CYContext {
     CYContext(CYOptions &options) :
         options_(options),
         scope_(NULL),
     CYContext(CYOptions &options) :
         options_(options),
         scope_(NULL),

+        this_(NULL),

         nonlocal_(NULL),
         nextlocal_(NULL),
         unique_(0)
         nonlocal_(NULL),
         nextlocal_(NULL),
         unique_(0)


@@ -414,6 +415,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
 struct CYBlock :
     CYStatement,
     CYThing


@@ -430,7 +450,7 @@ struct CYBlock :
     }
 
     void AddPrev(CYStatement *statement) {
     }
 
     void AddPrev(CYStatement *statement) {

-        CYLast(statement) = statements_;
+        CYSetLast(statement) = statements_;

         statements_ = statement;
     }
 
         statements_ = statement;
     }
 


@@ -440,87 +460,25 @@ struct CYBlock :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

-enum CYState {
-    CYClear,
-    CYRestricted,
-    CYNewLine
-};
-
-class CYDriver {
-  public:
-    void *scanner_;
-
-    CYState state_;
-    bool nobrace_;
-    std::stack<bool> in_;
-
-    const char *data_;
-    size_t size_;
-    FILE *file_;
-
-    bool strict_;
-
-    enum Condition {
-        RegExpCondition,
-        XMLContentCondition,
-        XMLTagCondition,
-    };
-
-    std::string filename_;
-
-    struct Error {
-        bool warning_;
-        cy::location location_;
-        std::string message_;
-    };
-
-    typedef std::vector<Error> Errors;
-
-    CYProgram *program_;
-    Errors errors_;
-
-    bool auto_;
-
-    struct Context {
-        CYExpression *context_;
-
-        Context(CYExpression *context) :
-            context_(context)
-        {
-        }
-
-        typedef std::vector<CYWord *> Words;
-        Words words_;
-    };
-
-    typedef std::vector<Context> Contexts;
-    Contexts contexts_;
-
-    CYExpression *context_;
-
-    enum Mode {
-        AutoNone,
-        AutoPrimary,
-        AutoDirect,
-        AutoIndirect,
-        AutoMessage
-    } mode_;
-
+class CYStream :
+    public std::istream
+{

   private:
   private:

-    void ScannerInit();
-    void ScannerDestroy();
+    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:
 
   public:

-    CYDriver(const std::string &filename = "");
-    ~CYDriver();
-
-    Condition GetCondition();
-    void SetCondition(Condition condition);
-
-    void PushCondition(Condition condition);
-    void PopCondition();
-
-    void Warning(const cy::location &location, const char *message);
+    CYStream(const char *start, const char *end) :
+        std::istream(&buffer_),
+        buffer_(start, end)
+    {
+    }

 };
 
 struct CYForInitialiser {
 };
 
 struct CYForInitialiser {


@@ -554,7 +512,7 @@ struct CYExpression :
     CYClassName,
     CYThing
 {
     CYClassName,
     CYThing
 {

-    virtual unsigned Precedence() const = 0;
+    virtual int Precedence() const = 0;

 
     virtual bool RightHand() const {
         return true;
 
     virtual bool RightHand() const {
         return true;


@@ -567,7 +525,7 @@ struct CYExpression :
 
     virtual void Output(CYOutput &out) const;
     virtual void Output(CYOutput &out, CYFlags flags) const = 0;
 
     virtual void Output(CYOutput &out) const;
     virtual void Output(CYOutput &out, CYFlags flags) const = 0;

-    void Output(CYOutput &out, unsigned precedence, CYFlags flags) const;
+    void Output(CYOutput &out, int precedence, CYFlags flags) const;

 
     virtual CYExpression *ClassName(CYContext &context, bool object);
     virtual void ClassName(CYOutput &out, bool object) const;
 
     virtual CYExpression *ClassName(CYContext &context, bool object);
     virtual void ClassName(CYOutput &out, bool object) const;


@@ -598,8 +556,8 @@ struct CYExpression :
     }
 
 #define CYPrecedence(value) \
     }
 
 #define CYPrecedence(value) \

-    static const unsigned Precedence_ = value; \
-    virtual unsigned Precedence() const { \
+    static const int Precedence_ = value; \
+    virtual int Precedence() const { \

         return Precedence_; \
     }
 
         return Precedence_; \
     }
 


@@ -619,7 +577,7 @@ struct CYCompound :
     }
 
     void AddPrev(CYExpression *expression) {
     }
 
     void AddPrev(CYExpression *expression) {

-        CYLast(expression) = expressions_;
+        CYSetLast(expression) = expressions_;

         expressions_ = expression;
     }
 
         expressions_ = expression;
     }
 


@@ -1371,7 +1329,7 @@ struct New :
     {
     }
 
     {
     }
 

-    virtual unsigned Precedence() const {
+    virtual int Precedence() const {

         return arguments_ == NULL ? 2 : 1;
     }
 
         return arguments_ == NULL ? 2 : 1;
     }
 


@@ -1482,7 +1440,9 @@ struct CYFunction {
     CYIdentifier *name_;
     CYFunctionParameter *parameters_;
     CYBlock code_;
     CYIdentifier *name_;
     CYFunctionParameter *parameters_;
     CYBlock code_;

+

     CYNonLocal *nonlocal_;
     CYNonLocal *nonlocal_;

+    CYThisScope this_;

 
     CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
         name_(name),
 
     CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
         name_(name),


@@ -1517,6 +1477,23 @@ struct CYFunctionExpression :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     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
 // XXX: this should derive from CYAnonymousFunctionExpression
 struct CYRubyProc :
     CYFunctionExpression


@@ -1623,6 +1600,199 @@ struct CYFinally :
     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 

+struct CYTypeModifier :
+    CYNext<CYTypeModifier>
+{
+    CYTypeModifier(CYTypeModifier *next) :
+        CYNext<CYTypeModifier>(next)
+    {
+    }
+
+    virtual int Precedence() const = 0;
+
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type) = 0;
+    CYExpression *Replace(CYContext &context, CYExpression *type);
+
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const = 0;
+    void Output(CYOutput &out, int precedence, CYIdentifier *identifier) const;
+};
+
+struct CYTypeArrayOf :
+    CYTypeModifier
+{
+    CYExpression *size_;
+
+    CYTypeArrayOf(CYExpression *size, CYTypeModifier *next = NULL) :
+        CYTypeModifier(next),
+        size_(size)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+};
+
+struct CYTypeConstant :
+    CYTypeModifier
+{
+    CYTypeConstant(CYTypeModifier *next = NULL) :
+        CYTypeModifier(next)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+};
+
+struct CYTypePointerTo :
+    CYTypeModifier
+{
+    CYTypePointerTo(CYTypeModifier *next = NULL) :
+        CYTypeModifier(next)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+};
+
+struct CYTypeVolatile :
+    CYTypeModifier
+{
+    CYTypeVolatile(CYTypeModifier *next = NULL) :
+        CYTypeModifier(next)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+};
+
+struct CYTypedIdentifier :
+    CYNext<CYTypedIdentifier>,
+    CYThing
+{
+    CYIdentifier *identifier_;
+    CYExpression *type_;
+    CYTypeModifier *modifier_;
+
+    CYTypedIdentifier(CYIdentifier *identifier = NULL) :
+        identifier_(identifier),
+        type_(NULL),
+        modifier_(NULL)
+    {
+    }
+
+    CYTypedIdentifier(CYExpression *type, CYTypeModifier *modifier = NULL) :
+        identifier_(NULL),
+        type_(type),
+        modifier_(modifier)
+    {
+    }
+
+    inline CYTypedIdentifier *Modify(CYTypeModifier *modifier) {
+        CYSetLast(modifier_) = modifier;
+        return this;
+    }
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYEncodedType :
+    CYExpression
+{
+    CYTypedIdentifier *typed_;
+
+    CYEncodedType(CYTypedIdentifier *typed) :
+        typed_(typed)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYTypedParameter :
+    CYNext<CYTypedParameter>,
+    CYThing
+{
+    CYTypedIdentifier *typed_;
+
+    CYTypedParameter(CYTypedIdentifier *typed, CYTypedParameter *next) :
+        CYNext<CYTypedParameter>(next),
+        typed_(typed)
+    {
+    }
+
+    CYArgument *Argument(CYContext &context);
+    CYFunctionParameter *Parameters(CYContext &context);
+    CYExpression *TypeSignature(CYContext &context, CYExpression *prefix);
+
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYLambda :
+    CYExpression
+{
+    CYTypedIdentifier *typed_;
+    CYTypedParameter *parameters_;
+    CYStatement *statements_;
+
+    CYLambda(CYTypedIdentifier *typed, CYTypedParameter *parameters, CYStatement *statements) :
+        typed_(typed),
+        parameters_(parameters),
+        statements_(statements)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYTypeDefinition :
+    CYStatement
+{
+    CYTypedIdentifier *typed_;
+
+    CYTypeDefinition(CYTypedIdentifier *typed) :
+        typed_(typed)
+    {
+    }
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYTypeFunctionWith :
+    CYTypeModifier
+{
+    CYTypedParameter *parameters_;
+
+    CYTypeFunctionWith(CYTypedParameter *parameters, CYTypeModifier *next = NULL) :
+        CYTypeModifier(next),
+        parameters_(parameters)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+};
+

 namespace cy {
 namespace Syntax {
 
 namespace cy {
 namespace Syntax {