X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/e7ed5354ae029d47ace1bc152aa5686f495e5737..6f926cee9d6b259845cd91069cb7c6f488d1eed6:/Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 346fb93..66bd872 100644
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -1,3 +1,42 @@
+/* Cycript - Remove Execution Server and Disassembler
+ * Copyright (C) 2009  Jay Freeman (saurik)
+*/
+
+/* Modified BSD License {{{ */
+/*
+ *        Redistribution and use in source and binary
+ * forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer in the documentation
+ *    and/or other materials provided with the
+ *    distribution.
+ * 3. The name of the author may not be used to endorse
+ *    or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/* }}} */
+
 #ifndef CYPARSER_HPP
 #define CYPARSER_HPP
 
@@ -5,6 +44,7 @@
 #include <string>
 #include <vector>
 
+#include "location.hh"
 #include "Pooling.hpp"
 
 template <typename Type_>
@@ -16,6 +56,11 @@ struct CYNext {
     {
     }
 
+    CYNext(Type_ *next) :
+        next_(next)
+    {
+    }
+
     void SetNext(Type_ *next) {
         next_ = next;
     }
@@ -30,26 +75,31 @@ _finline std::ostream &operator <<(std::ostream &out, const CYThing &rhs) {
     return out;
 }
 
-struct CYPart {
-    virtual void Part(std::ostream &out) const = 0;
-};
-
 struct CYSource :
     CYNext<CYSource>
 {
+    virtual bool IsBlock() const {
+        return next_ != NULL;
+    }
+
     virtual void Show(std::ostream &out) const;
     virtual void Output(std::ostream &out) const = 0;
     virtual void Output(std::ostream &out, bool block) const;
+    virtual void Output_(std::ostream &out) const;
 };
 
-struct CYName :
-    CYThing
-{
-    virtual const char *Name() const = 0;
+struct CYPropertyName {
+    virtual void PropertyName(std::ostream &out) const = 0;
+};
+
+struct CYClassName {
+    virtual void ClassName(std::ostream &out, bool object) const = 0;
 };
 
 struct CYWord :
-    CYName
+    CYThing,
+    CYPropertyName,
+    CYClassName
 {
     const char *word_;
 
@@ -62,11 +112,10 @@ struct CYWord :
         return word_;
     }
 
-    virtual const char *Name() const {
-        return Value();
-    }
-
     virtual void Output(std::ostream &out) const;
+
+    virtual void ClassName(std::ostream &out, bool object) const;
+    virtual void PropertyName(std::ostream &out) const;
 };
 
 struct CYIdentifier :
@@ -78,13 +127,14 @@ struct CYIdentifier :
     }
 };
 
-struct CYLabel {
-    CYIdentifier *identifier_;
-    CYLabel *next_;
+struct CYLabel :
+    CYNext<CYLabel>
+{
+    CYIdentifier *name_;
 
-    CYLabel(CYIdentifier *identifier, CYLabel *next) :
-        identifier_(identifier),
-        next_(next)
+    CYLabel(CYIdentifier *name, CYLabel *next) :
+        CYNext<CYLabel>(next),
+        name_(name)
     {
     }
 };
@@ -92,11 +142,35 @@ struct CYLabel {
 struct CYStatement :
     CYSource
 {
-    CYLabel *label_;
+    CYLabel *labels_;
+
+    CYStatement() :
+        labels_(NULL)
+    {
+    }
 
     void AddLabel(CYIdentifier *identifier) {
-        label_ = new CYLabel(identifier, label_);
+        labels_ = new CYLabel(identifier, labels_);
+    }
+
+    virtual void Output_(std::ostream &out) const;
+};
+
+struct CYBlock :
+    CYStatement
+{
+    CYStatement *statements_;
+
+    CYBlock(CYStatement *statements) :
+        statements_(statements)
+    {
     }
+
+    virtual bool IsBlock() const {
+        return true;
+    }
+
+    virtual void Output(std::ostream &out) const;
 };
 
 enum CYState {
@@ -114,10 +188,19 @@ class CYDriver {
 
     const char *data_;
     size_t size_;
+    FILE *file_;
 
     std::string filename_;
 
-    std::vector<CYSource *> source_;
+    struct Error {
+        cy::location location_;
+        std::string message_;
+    };
+
+    typedef std::vector<Error> Errors;
+
+    CYSource *source_;
+    Errors errors_;
 
   private:
     void ScannerInit();
@@ -126,60 +209,241 @@ class CYDriver {
   public:
     CYDriver(const std::string &filename);
     ~CYDriver();
+};
 
-    void Clear();
+enum CYFlags {
+    CYNoFlags =    0,
+    CYNoBrace =    (1 << 0),
+    CYNoFunction = (1 << 1),
+    CYNoLeader =   (1 << 2),
+    CYNoTrailer =  (1 << 3),
+    CYNoIn =       (1 << 4),
+    CYNoHyphen =   (1 << 5),
+    CYNoBF =       (CYNoBrace | CYNoFunction),
 };
 
-struct CYForInitialiser :
-    CYPart
-{
+struct CYForInitialiser {
+    virtual void For(std::ostream &out) const = 0;
 };
 
-struct CYForInInitialiser :
-    CYPart
-{
+struct CYForInInitialiser {
+    virtual void ForIn(std::ostream &out, CYFlags flags) const = 0;
+    virtual const char *ForEachIn() const = 0;
+    virtual void ForEachIn(std::ostream &out) const = 0;
 };
 
 struct CYExpression :
     CYNext<CYExpression>,
     CYForInitialiser,
-    CYForInInitialiser
+    CYForInInitialiser,
+    CYClassName
 {
-    virtual void Part(std::ostream &out) const;
-    virtual void Output(std::ostream &out) const = 0;
-    void Output(std::ostream &out, bool raw) const;
+    virtual unsigned Precedence() const = 0;
+
+    virtual void For(std::ostream &out) const;
+    virtual void ForIn(std::ostream &out, CYFlags flags) const;
+
+    virtual const char *ForEachIn() const;
+    virtual void ForEachIn(std::ostream &out) const;
+
+    virtual void Output(std::ostream &out, CYFlags flags) const = 0;
+    void Output(std::ostream &out, unsigned precedence, CYFlags flags) const;
+
+    virtual void ClassName(std::ostream &out, bool object) const;
+
+    virtual const char *Word() const {
+        return NULL;
+    }
 };
 
-_finline std::ostream &operator <<(std::ostream &out, const CYExpression &rhs) {
-    rhs.Output(out, false);
-    return out;
-}
+#define CYAlphabetic(value) \
+    virtual bool Alphabetic() const { \
+        return value; \
+    }
+
+#define CYPrecedence(value) \
+    virtual unsigned Precedence() const { \
+        return value; \
+    }
+
+struct CYCompound :
+    CYExpression
+{
+    CYExpression *expressions_;
+
+    CYCompound(CYExpression *expressions) :
+        expressions_(expressions)
+    {
+    }
+
+    void AddPrev(CYExpression *expression) {
+        CYExpression *last(expression);
+        while (last->next_ != NULL)
+            last = last->next_;
+        last->SetNext(expressions_);
+        expressions_ = expression;
+    }
+
+    CYPrecedence(17)
+
+    void Output(std::ostream &out, CYFlags flags) const;
+};
+
+struct CYComprehension :
+    CYNext<CYComprehension>
+{
+    void Output(std::ostream &out) const;
+    virtual const char *Name() const = 0;
+
+    virtual void Begin_(std::ostream &out) const = 0;
+
+    virtual void End_(std::ostream &out) const {
+    }
+};
+
+struct CYForInComprehension :
+    CYComprehension
+{
+    CYIdentifier *name_;
+    CYExpression *set_;
+
+    CYForInComprehension(CYIdentifier *name, CYExpression *set) :
+        name_(name),
+        set_(set)
+    {
+    }
+
+    virtual const char *Name() const {
+        return name_->Value();
+    }
+
+    virtual void Begin_(std::ostream &out) const;
+};
+
+struct CYForEachInComprehension :
+    CYComprehension
+{
+    CYIdentifier *name_;
+    CYExpression *set_;
+
+    CYForEachInComprehension(CYIdentifier *name, CYExpression *set) :
+        name_(name),
+        set_(set)
+    {
+    }
+
+    virtual const char *Name() const {
+        return name_->Value();
+    }
+
+    virtual void Begin_(std::ostream &out) const;
+    virtual void End_(std::ostream &out) const;
+};
+
+struct CYIfComprehension :
+    CYComprehension
+{
+    CYExpression *test_;
+
+    CYIfComprehension(CYExpression *test) :
+        test_(test)
+    {
+    }
+
+    virtual const char *Name() const {
+        return NULL;
+    }
+
+    virtual void Begin_(std::ostream &out) const;
+};
+
+struct CYArrayComprehension :
+    CYExpression
+{
+    CYExpression *expression_;
+    CYComprehension *comprehensions_;
+
+    CYArrayComprehension(CYExpression *expression, CYComprehension *comprehensions) :
+        expression_(expression),
+        comprehensions_(comprehensions)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
+};
 
 struct CYLiteral :
     CYExpression
 {
+    CYPrecedence(0)
 };
 
-struct CYSelector :
-    CYLiteral
+struct CYMagic :
+    CYExpression
+{
+    CYPrecedence(0)
+};
+
+struct CYSelectorPart :
+    CYNext<CYSelectorPart>
 {
     CYWord *name_;
     bool value_;
-    CYSelector *after_;
 
-    CYSelector(CYWord *name, bool value, CYSelector *after) :
+    CYSelectorPart(CYWord *name, bool value, CYSelectorPart *next) :
+        CYNext<CYSelectorPart>(next),
         name_(name),
-        value_(value),
-        after_(after)
+        value_(value)
     {
     }
 
     virtual void Output(std::ostream &out) const;
 };
 
+struct CYSelector :
+    CYLiteral
+{
+    CYSelectorPart *name_;
+
+    CYSelector(CYSelectorPart *name) :
+        name_(name)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
+};
+
+struct CYRange {
+    uint64_t lo_;
+    uint64_t hi_;
+
+    CYRange(uint64_t lo, uint64_t hi) :
+        lo_(lo), hi_(hi)
+    {
+    }
+
+    bool operator [](uint8_t value) const {
+        return !(value >> 7) && (value >> 6 ? hi_ : lo_) >> (value & 0x3f) & 0x1;
+    }
+
+    void operator()(uint8_t value) {
+        if (value >> 7)
+            return;
+        (value >> 6 ? hi_ : lo_) |= uint64_t(0x1) << (value & 0x3f);
+    }
+};
+
+extern CYRange DigitRange_;
+extern CYRange WordStartRange_;
+extern CYRange WordEndRange_;
+
 struct CYString :
     CYLiteral,
-    CYName
+    CYPropertyName
 {
     const char *value_;
     size_t size_;
@@ -200,16 +464,26 @@ struct CYString :
         return value_;
     }
 
-    virtual const char *Name() const {
+    virtual const char *Word() const {
+        if (size_ == 0 || !WordStartRange_[value_[0]])
+            return NULL;
+        for (size_t i(1); i != size_; ++i)
+            if (!WordEndRange_[value_[i]])
+                return NULL;
         return Value();
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(std::ostream &out) const {
+        return Output(out, CYNoFlags);
+    }
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void PropertyName(std::ostream &out) const;
 };
 
 struct CYNumber :
     CYLiteral,
-    CYName
+    CYPropertyName
 {
     double value_;
 
@@ -222,11 +496,12 @@ struct CYNumber :
         return value_;
     }
 
-    virtual const char *Name() const {
-        throw;
+    virtual void Output(std::ostream &out) const {
+        return Output(out, CYNoFlags);
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void PropertyName(std::ostream &out) const;
 };
 
 struct CYNull :
@@ -238,26 +513,26 @@ struct CYNull :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYThis :
     CYWord,
-    CYExpression
+    CYMagic
 {
     CYThis() :
         CYWord("this")
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYBoolean :
     CYLiteral
 {
     virtual bool Value() const = 0;
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYFalse :
@@ -269,9 +544,7 @@ struct CYFalse :
     {
     }
 
-    virtual bool Value() const {
-        return false;
-    }
+    virtual bool Value() const;
 };
 
 struct CYTrue :
@@ -283,9 +556,7 @@ struct CYTrue :
     {
     }
 
-    virtual bool Value() const {
-        return true;
-    }
+    virtual bool Value() const;
 };
 
 struct CYVariable :
@@ -298,7 +569,9 @@ struct CYVariable :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    CYPrecedence(0)
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYPrefix :
@@ -311,9 +584,10 @@ struct CYPrefix :
     {
     }
 
+    virtual bool Alphabetic() const = 0;
     virtual const char *Operator() const = 0;
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYInfix :
@@ -328,9 +602,14 @@ struct CYInfix :
     {
     }
 
+    void SetLeft(CYExpression *lhs) {
+        lhs_ = lhs;
+    }
+
+    virtual bool Alphabetic() const = 0;
     virtual const char *Operator() const = 0;
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYPostfix :
@@ -345,33 +624,44 @@ struct CYPostfix :
 
     virtual const char *Operator() const = 0;
 
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYAssignment :
-    CYInfix
+    CYExpression
 {
+    CYExpression *lhs_;
+    CYExpression *rhs_;
+
     CYAssignment(CYExpression *lhs, CYExpression *rhs) :
-        CYInfix(lhs, rhs)
+        lhs_(lhs),
+        rhs_(rhs)
     {
     }
 
+    void SetLeft(CYExpression *lhs) {
+        lhs_ = lhs;
+    }
+
     virtual const char *Operator() const = 0;
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
-struct CYArgument {
+struct CYArgument :
+    CYNext<CYArgument>
+{
     CYWord *name_;
     CYExpression *value_;
-    CYArgument *next_;
 
     CYArgument(CYWord *name, CYExpression *value, CYArgument *next = NULL) :
+        CYNext<CYArgument>(next),
         name_(name),
-        value_(value),
-        next_(next)
+        value_(value)
     {
     }
 
-    void Output(std::ostream &out, bool send) const;
+    void Output(std::ostream &out) const;
 };
 
 struct CYBlank :
@@ -400,23 +690,33 @@ struct CYClause :
 };
 
 struct CYElement :
-    CYLiteral
+    CYNext<CYElement>
 {
     CYExpression *value_;
-    CYElement *next_;
 
     CYElement(CYExpression *value, CYElement *next) :
-        value_(value),
-        next_(next)
+        CYNext<CYElement>(next),
+        value_(value)
     {
     }
 
-    void Output(std::ostream &out, bool raw) const;
-    virtual void Output(std::ostream &out) const;
+    void Output(std::ostream &out) const;
+};
+
+struct CYArray :
+    CYLiteral
+{
+    CYElement *elements_;
+
+    CYArray(CYElement *elements) :
+        elements_(elements)
+    {
+    }
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYDeclaration :
-    CYThing,
     CYForInInitialiser
 {
     CYIdentifier *identifier_;
@@ -428,36 +728,145 @@ struct CYDeclaration :
     {
     }
 
-    virtual void Part(std::ostream &out) const;
-    virtual void Output(std::ostream &out) const;
+    virtual void ForIn(std::ostream &out, CYFlags flags) const;
+
+    virtual const char *ForEachIn() const;
+    virtual void ForEachIn(std::ostream &out) const;
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYDeclarations :
-    CYStatement,
+    CYNext<CYDeclarations>,
     CYForInitialiser
 {
     CYDeclaration *declaration_;
-    CYDeclarations *next_;
 
     CYDeclarations(CYDeclaration *declaration, CYDeclarations *next) :
-        declaration_(declaration),
-        next_(next)
+        CYNext<CYDeclarations>(next),
+        declaration_(declaration)
+    {
+    }
+
+    virtual void For(std::ostream &out) const;
+    virtual void Output(std::ostream &out, CYFlags flags) const;
+};
+
+struct CYVar :
+    CYStatement
+{
+    CYDeclarations *declarations_;
+
+    CYVar(CYDeclarations *declarations) :
+        declarations_(declarations)
     {
     }
 
-    virtual void Part(std::ostream &out) const;
     virtual void Output(std::ostream &out) const;
 };
 
-struct CYParameter :
-    CYThing
+struct CYLet :
+    CYStatement
 {
+    CYDeclarations *declarations_;
+    CYStatement *statements_;
+
+    CYLet(CYDeclarations *declarations, CYStatement *statements) :
+        declarations_(declarations),
+        statements_(statements)
+    {
+    }
+
+    virtual void Output(std::ostream &out) const;
+};
+
+struct CYField :
+    CYNext<CYField>
+{
+    virtual void Output(std::ostream &out) const;
+};
+
+struct CYMessageParameter :
+    CYNext<CYMessageParameter>
+{
+    CYWord *tag_;
+    CYExpression *type_;
     CYIdentifier *name_;
-    CYParameter *next_;
 
-    CYParameter(CYIdentifier *name, CYParameter *next) :
+    CYMessageParameter(CYWord *tag, CYExpression *type, CYIdentifier *name) :
+        tag_(tag),
+        type_(type),
+        name_(name)
+    {
+    }
+};
+
+struct CYMessage :
+    CYNext<CYMessage>
+{
+    bool instance_;
+    CYExpression *type_;
+    CYMessageParameter *parameter_;
+    CYSource *body_;
+
+    CYMessage(bool instance, CYExpression *type, CYMessageParameter *parameter, CYSource *body) :
+        instance_(instance),
+        type_(type),
+        parameter_(parameter),
+        body_(body)
+    {
+    }
+
+    virtual void Output(std::ostream &out, bool replace) const;
+};
+
+struct CYClass :
+    CYExpression,
+    CYStatement
+{
+    CYClassName *name_;
+    CYExpression *super_;
+    CYField *fields_;
+    CYMessage *messages_;
+
+    CYClass(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
         name_(name),
-        next_(next)
+        super_(super),
+        fields_(fields),
+        messages_(messages)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual void Output(std::ostream &out) const;
+    virtual void Output(std::ostream &out, CYFlags flags) const;
+};
+
+struct CYCategory :
+    CYStatement
+{
+    CYClassName *name_;
+    CYMessage *messages_;
+
+    CYCategory(CYClassName *name, CYMessage *messages) :
+        name_(name),
+        messages_(messages)
+    {
+    }
+
+    virtual void Output(std::ostream &out) const;
+};
+
+struct CYFunctionParameter :
+    CYNext<CYFunctionParameter>,
+    CYThing
+{
+    CYIdentifier *name_;
+
+    CYFunctionParameter(CYIdentifier *name, CYFunctionParameter *next) :
+        CYNext<CYFunctionParameter>(next),
+        name_(name)
     {
     }
 
@@ -500,15 +909,33 @@ struct CYForIn :
     virtual void Output(std::ostream &out) const;
 };
 
-struct CYProperty {
-    CYName *name_;
+struct CYForEachIn :
+    CYStatement
+{
+    CYForInInitialiser *initialiser_;
+    CYExpression *set_;
+    CYStatement *code_;
+
+    CYForEachIn(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :
+        initialiser_(initialiser),
+        set_(set),
+        code_(code)
+    {
+    }
+
+    virtual void Output(std::ostream &out) const;
+};
+
+struct CYProperty :
+    CYNext<CYProperty>
+{
+    CYPropertyName *name_;
     CYExpression *value_;
-    CYProperty *next_;
 
-    CYProperty(CYName *name, CYExpression *value, CYProperty *next) :
+    CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next) :
+        CYNext<CYProperty>(next),
         name_(name),
-        value_(value),
-        next_(next)
+        value_(value)
     {
     }
 
@@ -525,7 +952,7 @@ struct CYObject :
     {
     }
 
-    void Output(std::ostream &out) const;
+    void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYCatch :
@@ -543,19 +970,21 @@ struct CYCatch :
     virtual void Output(std::ostream &out) const;
 };
 
-struct CYMessage :
+struct CYSend :
     CYExpression
 {
     CYExpression *self_;
     CYArgument *arguments_;
 
-    CYMessage(CYExpression *self, CYArgument *arguments) :
+    CYSend(CYExpression *self, CYArgument *arguments) :
         self_(self),
         arguments_(arguments)
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    CYPrecedence(0)
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYMember :
@@ -570,7 +999,35 @@ struct CYMember :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    void SetLeft(CYExpression *object) {
+        object_ = object;
+    }
+};
+
+struct CYDirectMember :
+    CYMember
+{
+    CYDirectMember(CYExpression *object, CYExpression *property) :
+        CYMember(object, property)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
+};
+
+struct CYIndirectMember :
+    CYMember
+{
+    CYIndirectMember(CYExpression *object, CYExpression *property) :
+        CYMember(object, property)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYNew :
@@ -585,7 +1042,9 @@ struct CYNew :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    CYPrecedence(1)
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYCall :
@@ -600,7 +1059,9 @@ struct CYCall :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    CYPrecedence(2)
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYIf :
@@ -654,24 +1115,26 @@ struct CYLambda :
     CYExpression
 {
     CYIdentifier *name_;
-    CYParameter *parameters_;
+    CYFunctionParameter *parameters_;
     CYSource *body_;
 
-    CYLambda(CYIdentifier *name, CYParameter *parameters, CYSource *body) :
+    CYLambda(CYIdentifier *name, CYFunctionParameter *parameters, CYSource *body) :
         name_(name),
         parameters_(parameters),
         body_(body)
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    CYPrecedence(0)
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYFunction :
     CYLambda,
     CYSource
 {
-    CYFunction(CYIdentifier *name, CYParameter *parameters, CYSource *body) :
+    CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYSource *body) :
         CYLambda(name, parameters, body)
     {
     }
@@ -806,12 +1269,15 @@ struct CYCondition :
     CYExpression *false_;
 
     CYCondition(CYExpression *test, CYExpression *_true, CYExpression *_false) :
+        test_(test),
         true_(_true),
         false_(_false)
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    CYPrecedence(15)
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYAddressOf :
@@ -826,7 +1292,10 @@ struct CYAddressOf :
         return "&";
     }
 
-    virtual void Output(std::ostream &out) const;
+    CYAlphabetic(false)
+    CYPrecedence(2)
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 struct CYIndirect :
@@ -841,7 +1310,10 @@ struct CYIndirect :
         return "*";
     }
 
-    virtual void Output(std::ostream &out) const;
+    CYAlphabetic(false)
+    CYPrecedence(1)
+
+    virtual void Output(std::ostream &out, CYFlags flags) const;
 };
 
 #define CYPostfix_(op, name) \
@@ -852,13 +1324,15 @@ struct CYIndirect :
             CYPostfix(lhs) \
         { \
         } \
+    \
+        CYPrecedence(3) \
     \
         virtual const char *Operator() const { \
             return op; \
         } \
     };
 
-#define CYPrefix_(op, name) \
+#define CYPrefix_(alphabetic, op, name) \
     struct CY ## name : \
         CYPrefix \
     { \
@@ -866,13 +1340,16 @@ struct CYIndirect :
             CYPrefix(rhs) \
         { \
         } \
+    \
+        CYAlphabetic(alphabetic) \
+        CYPrecedence(4) \
     \
         virtual const char *Operator() const { \
             return op; \
         } \
     };
 
-#define CYInfix_(op, name) \
+#define CYInfix_(alphabetic, precedence, op, name) \
     struct CY ## name : \
         CYInfix \
     { \
@@ -880,6 +1357,9 @@ struct CYIndirect :
             CYInfix(lhs, rhs) \
         { \
         } \
+    \
+        CYAlphabetic(alphabetic) \
+        CYPrecedence(precedence) \
     \
         virtual const char *Operator() const { \
             return op; \
@@ -894,6 +1374,8 @@ struct CYIndirect :
             CYAssignment(lhs, rhs) \
         { \
         } \
+    \
+        CYPrecedence(16) \
     \
         virtual const char *Operator() const { \
             return op; \
@@ -903,38 +1385,38 @@ struct CYIndirect :
 CYPostfix_("++", PostIncrement)
 CYPostfix_("--", PostDecrement)
 
-CYPrefix_("delete", Delete)
-CYPrefix_("void", Void)
-CYPrefix_("typeof", TypeOf)
-CYPrefix_("++", PreIncrement)
-CYPrefix_("--", PreDecrement)
-CYPrefix_("-", Negate)
-CYPrefix_("~", BitwiseNot)
-CYPrefix_("!", LogicalNot)
-
-CYInfix_("*", Multiply)
-CYInfix_("/", Divide)
-CYInfix_("%", Modulus)
-CYInfix_("+", Add)
-CYInfix_("-", Subtract)
-CYInfix_("<<", ShiftLeft)
-CYInfix_(">>", ShiftRightSigned)
-CYInfix_(">>>", ShiftRightUnsigned)
-CYInfix_("<", Less)
-CYInfix_(">", Greater)
-CYInfix_("<=", LessOrEqual)
-CYInfix_(">=", GreaterOrEqual)
-CYInfix_("instanceof", InstanceOf)
-CYInfix_("in", In)
-CYInfix_("==", Equal)
-CYInfix_("!=", NotEqual)
-CYInfix_("===", Identical)
-CYInfix_("!==", NotIdentical)
-CYInfix_("&", BitwiseAnd)
-CYInfix_("^", BitwiseXOr)
-CYInfix_("|", BitwiseOr)
-CYInfix_("&&", LogicalAnd)
-CYInfix_("||", LogicalOr)
+CYPrefix_(true, "delete", Delete)
+CYPrefix_(true, "void", Void)
+CYPrefix_(true, "typeof", TypeOf)
+CYPrefix_(false, "++", PreIncrement)
+CYPrefix_(false, "--", PreDecrement)
+CYPrefix_(false, "-", Negate)
+CYPrefix_(false, "~", BitwiseNot)
+CYPrefix_(false, "!", LogicalNot)
+
+CYInfix_(false, 5, "*", Multiply)
+CYInfix_(false, 5, "/", Divide)
+CYInfix_(false, 5, "%", Modulus)
+CYInfix_(false, 6, "+", Add)
+CYInfix_(false, 6, "-", Subtract)
+CYInfix_(false, 7, "<<", ShiftLeft)
+CYInfix_(false, 7, ">>", ShiftRightSigned)
+CYInfix_(false, 7, ">>>", ShiftRightUnsigned)
+CYInfix_(false, 8, "<", Less)
+CYInfix_(false, 8, ">", Greater)
+CYInfix_(false, 8, "<=", LessOrEqual)
+CYInfix_(false, 8, ">=", GreaterOrEqual)
+CYInfix_(true, 8, "instanceof", InstanceOf)
+CYInfix_(true, 8, "in", In)
+CYInfix_(false, 9, "==", Equal)
+CYInfix_(false, 9, "!=", NotEqual)
+CYInfix_(false, 9, "===", Identical)
+CYInfix_(false, 9, "!==", NotIdentical)
+CYInfix_(false, 10, "&", BitwiseAnd)
+CYInfix_(false, 11, "^", BitwiseXOr)
+CYInfix_(false, 12, "|", BitwiseOr)
+CYInfix_(false, 13, "&&", LogicalAnd)
+CYInfix_(false, 14, "||", LogicalOr)
 
 CYAssignment_("=", )
 CYAssignment_("*=", Multiply)