X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/11c1cc16b7cda02473081cc398195484a1ab82f2..697d6fd2b2bf66a1f0bf1f28de0ced96fc14cbfc:/Parser.hpp diff --git a/Parser.hpp b/Parser.hpp index 0ef73f5..63aa17a 100644 --- a/Parser.hpp +++ b/Parser.hpp @@ -1,4 +1,4 @@ -/* Cycript - Remove Execution Server and Disassembler +/* Cycript - Remote Execution Server and Disassembler * Copyright (C) 2009 Jay Freeman (saurik) */ @@ -40,10 +40,16 @@ #ifndef CYPARSER_HPP #define CYPARSER_HPP -#include +// XXX: wtf is this here?! +#define CYPA 16 + +#include + #include #include +#include + #include "location.hh" #include "Pooling.hpp" @@ -75,20 +81,31 @@ struct CYOutput { bool pretty_; unsigned indent_; + enum { + NoMode, + NoLetter, + NoPlus, + NoHyphen, + Terminated + } mode_; + CYOutput(std::ostream &out) : out_(out), pretty_(false), - indent_(0) + indent_(0), + mode_(NoMode) { } - _finline CYOutput &operator <<(char rhs) { - out_ << rhs; - return *this; - } + void Check(char value); + void Terminate(); + + CYOutput &operator <<(char rhs); + CYOutput &operator <<(const char *rhs); - _finline CYOutput &operator <<(const char *rhs) { - out_ << rhs; + _finline CYOutput &operator <<(const CYThing *rhs) { + if (rhs != NULL) + rhs->Output(*this); return *this; } @@ -96,15 +113,92 @@ struct CYOutput { rhs.Output(*this); return *this; } - - void Indent(); }; struct CYPropertyName { virtual void PropertyName(CYOutput &out) const = 0; }; +struct CYExpression; + +enum CYNeeded { + CYNever = -1, + CYSometimes = 0, + CYAlways = 1, +}; + +enum CYFlags { + CYNoFlags = 0, + CYNoBrace = (1 << 0), + CYNoFunction = (1 << 1), + CYNoIn = (1 << 2), + CYNoCall = (1 << 3), + CYNoRightHand = (1 << 4), + CYNoDangle = (1 << 5), + CYNoBF = (CYNoBrace | CYNoFunction), +}; + +struct CYContext { + apr_pool_t *pool_; + + CYContext(apr_pool_t *pool) : + pool_(pool) + { + } + + template + void Replace(Type_ *&value) { + if (value != NULL) + while (Type_ *replace = value->Replace(*this)) + value = replace; + } +}; + +struct CYStatement : + CYNext +{ + void Single(CYOutput &out, CYFlags flags) const; + void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const; + + CYStatement *ReplaceAll(CYContext &context); + + virtual CYStatement *Replace(CYContext &context) = 0; + + private: + virtual void Output(CYOutput &out, CYFlags flags) const = 0; +}; + +struct CYStatements { + CYStatement *first_; + CYStatement *last_; + + CYStatements() : + first_(NULL), + last_(NULL) + { + } + + operator CYStatement *() const { + return first_; + } + + CYStatements &operator ->*(CYStatement *next) { + if (next != NULL) + if (first_ == NULL) { + first_ = next; + last_ = next; + } else for (;; last_ = last_->next_) + if (last_->next_ == NULL) { + last_->next_ = next; + last_ = next; + break; + } + return *this; + } +}; + struct CYClassName { + virtual CYExpression *ClassName(CYContext &context, bool object) = 0; virtual void ClassName(CYOutput &out, bool object) const = 0; }; @@ -126,6 +220,7 @@ struct CYWord : virtual void Output(CYOutput &out) const; + virtual CYExpression *ClassName(CYContext &context, bool object); virtual void ClassName(CYOutput &out, bool object) const; virtual void PropertyName(CYOutput &out) const; }; @@ -144,65 +239,39 @@ struct CYIdentifier : }; struct CYLabel : - CYNext + CYStatement { CYIdentifier *name_; + CYStatement *statement_; - CYLabel(CYIdentifier *name, CYLabel *next) : - CYNext(next), - name_(name) + CYLabel(CYIdentifier *name, CYStatement *statement) : + name_(name), + statement_(statement) { } -}; -enum CYNeeded { - CYNever = -1, - CYSometimes = 0, - CYAlways = 1, -}; - -enum CYFlags { - CYNoFlags = 0, - CYNoBrace = (1 << 0), - CYNoFunction = (1 << 1), - CYNoLeader = (1 << 2), - CYNoTrailer = (1 << 3), - CYNoIn = (1 << 4), - CYNoHyphen = (1 << 5), - CYNoCall = (1 << 6), - CYNoRightHand = (1 << 7), - CYNoDangle = (1 << 8), - CYNoTerminator = (1 << 9), - CYNoBF = (CYNoBrace | CYNoFunction), + virtual CYStatement *Replace(CYContext &context); + virtual void Output(CYOutput &out, CYFlags flags) const; }; -struct CYStatement : - CYNext +struct CYProgram : + CYThing { - CYLabel *labels_; + CYStatement *statements_; - CYStatement() : - labels_(NULL) + CYProgram(CYStatement *statements) : + statements_(statements) { } - void AddLabel(CYIdentifier *identifier) { - labels_ = new CYLabel(identifier, labels_); - } - - virtual bool IsBlock() const { - return next_ != NULL; - } - - virtual void Single(CYOutput &out, CYFlags flags) const; - virtual void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const; + virtual void Replace(CYContext &context); - private: - virtual void Output(CYOutput &out, CYFlags flags) const = 0; + virtual void Output(CYOutput &out) const; }; struct CYBlock : - CYStatement + CYStatement, + CYThing { CYStatement *statements_; @@ -211,10 +280,13 @@ struct CYBlock : { } - virtual bool IsBlock() const { - return true; + operator CYStatement *() const { + return statements_; } + virtual CYStatement *Replace(CYContext &context); + + virtual void Output(CYOutput &out) const; virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -238,8 +310,7 @@ class CYDriver { bool strict_; enum Condition { - RegExStart, - RegExRest + RegExpCondition, }; std::string filename_; @@ -252,7 +323,7 @@ class CYDriver { typedef std::vector Errors; - CYStatement *program_; + CYProgram *program_; Errors errors_; private: @@ -263,7 +334,7 @@ class CYDriver { CYDriver(const std::string &filename); ~CYDriver(); - void SetCondition(Condition condition); + void BeginCondition(Condition condition); void Warning(const cy::location &location, const char *message); }; @@ -275,14 +346,18 @@ struct CYForInitialiser { struct CYForInInitialiser { virtual void ForIn(CYOutput &out, CYFlags flags) const = 0; virtual const char *ForEachIn() const = 0; - virtual void ForEachIn(CYOutput &out) const = 0; + virtual CYExpression *ForEachIn(CYContext &out) = 0; }; +struct CYNumber; +struct CYString; + struct CYExpression : CYNext, CYForInitialiser, CYForInInitialiser, - CYClassName + CYClassName, + CYThing { virtual unsigned Precedence() const = 0; @@ -294,13 +369,31 @@ struct CYExpression : virtual void ForIn(CYOutput &out, CYFlags flags) const; virtual const char *ForEachIn() const; - virtual void ForEachIn(CYOutput &out) const; + virtual CYExpression *ForEachIn(CYContext &out); + virtual void Output(CYOutput &out) const; virtual void Output(CYOutput &out, CYFlags flags) const = 0; void Output(CYOutput &out, unsigned precedence, CYFlags flags) const; + virtual CYExpression *ClassName(CYContext &context, bool object); virtual void ClassName(CYOutput &out, bool object) const; + CYExpression *ReplaceAll(CYContext &context); + + virtual CYExpression *Replace(CYContext &context) = 0; + + virtual CYExpression *Primitive(CYContext &context) { + return this; + } + + virtual CYNumber *Number(CYContext &context) { + return NULL; + } + + virtual CYString *String(CYContext &context) { + return NULL; + } + virtual const char *Word() const { return NULL; } @@ -341,19 +434,35 @@ struct CYCompound : CYPrecedence(17) + virtual CYExpression *Replace(CYContext &context); void Output(CYOutput &out, CYFlags flags) const; }; +struct CYFunctionParameter : + CYNext, + CYThing +{ + CYIdentifier *name_; + + CYFunctionParameter(CYIdentifier *name, CYFunctionParameter *next = NULL) : + CYNext(next), + name_(name) + { + } + + virtual void Output(CYOutput &out) const; +}; + struct CYComprehension : - CYNext + CYNext, + CYThing { - void Output(CYOutput &out) const; virtual const char *Name() const = 0; - virtual void Begin_(CYOutput &out) const = 0; - - virtual void End_(CYOutput &out) const { - } + virtual CYFunctionParameter *Parameter(CYContext &context) const = 0; + CYFunctionParameter *Parameters(CYContext &context) const; + virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const; + virtual void Output(CYOutput &out) const = 0; }; struct CYForInComprehension : @@ -372,7 +481,9 @@ struct CYForInComprehension : return name_->Value(); } - virtual void Begin_(CYOutput &out) const; + virtual CYFunctionParameter *Parameter(CYContext &context) const; + virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const; + virtual void Output(CYOutput &out) const; }; struct CYForEachInComprehension : @@ -391,8 +502,9 @@ struct CYForEachInComprehension : return name_->Value(); } - virtual void Begin_(CYOutput &out) const; - virtual void End_(CYOutput &out) const; + virtual CYFunctionParameter *Parameter(CYContext &context) const; + virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const; + virtual void Output(CYOutput &out) const; }; struct CYIfComprehension : @@ -409,7 +521,9 @@ struct CYIfComprehension : return NULL; } - virtual void Begin_(CYOutput &out) const; + virtual CYFunctionParameter *Parameter(CYContext &context) const; + virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const; + virtual void Output(CYOutput &out) const; }; struct CYArrayComprehension : @@ -426,6 +540,7 @@ struct CYArrayComprehension : CYPrecedence(0) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -436,6 +551,12 @@ struct CYLiteral : CYRightHand(false) }; +struct CYTrivial : + CYLiteral +{ + virtual CYExpression *Replace(CYContext &context); +}; + struct CYMagic : CYExpression { @@ -443,37 +564,6 @@ struct CYMagic : CYRightHand(false) }; -struct CYSelectorPart : - CYNext -{ - CYWord *name_; - bool value_; - - CYSelectorPart(CYWord *name, bool value, CYSelectorPart *next) : - CYNext(next), - name_(name), - value_(value) - { - } - - virtual void Output(CYOutput &out) const; -}; - -struct CYSelector : - CYLiteral -{ - CYSelectorPart *name_; - - CYSelector(CYSelectorPart *name) : - name_(name) - { - } - - CYPrecedence(1) - - virtual void Output(CYOutput &out, CYFlags flags) const; -}; - struct CYRange { uint64_t lo_; uint64_t hi_; @@ -499,20 +589,32 @@ extern CYRange WordStartRange_; extern CYRange WordEndRange_; struct CYString : - CYLiteral, + CYTrivial, CYPropertyName { const char *value_; size_t size_; + CYString() : + value_(NULL), + size_(0) + { + } + + CYString(const char *value) : + value_(value), + size_(strlen(value)) + { + } + CYString(const char *value, size_t size) : value_(value), size_(size) { } - CYString(const CYIdentifier *identifier) : - value_(identifier->Value()), + CYString(const CYWord *word) : + value_(word->Value()), size_(strlen(value_)) { } @@ -523,12 +625,16 @@ struct CYString : virtual const char *Word() const; + virtual CYNumber *Number(CYContext &context); + virtual CYString *String(CYContext &context); + + virtual CYString *Concat(CYContext &out, CYString *rhs) const; virtual void Output(CYOutput &out, CYFlags flags) const; virtual void PropertyName(CYOutput &out) const; }; struct CYNumber : - CYLiteral, + CYTrivial, CYPropertyName { double value_; @@ -542,12 +648,15 @@ struct CYNumber : return value_; } + virtual CYNumber *Number(CYContext &context); + virtual CYString *String(CYContext &context); + virtual void Output(CYOutput &out, CYFlags flags) const; virtual void PropertyName(CYOutput &out) const; }; struct CYRegEx : - CYLiteral + CYTrivial { const char *value_; @@ -565,13 +674,16 @@ struct CYRegEx : struct CYNull : CYWord, - CYLiteral + CYTrivial { CYNull() : CYWord("null") { } + virtual CYNumber *Number(CYContext &context); + virtual CYString *String(CYContext &context); + virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -584,11 +696,12 @@ struct CYThis : { } + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYBoolean : - CYLiteral + CYTrivial { virtual bool Value() const = 0; virtual void Output(CYOutput &out, CYFlags flags) const; @@ -606,6 +719,9 @@ struct CYFalse : virtual bool Value() const { return false; } + + virtual CYNumber *Number(CYContext &context); + virtual CYString *String(CYContext &context); }; struct CYTrue : @@ -620,6 +736,9 @@ struct CYTrue : virtual bool Value() const { return true; } + + virtual CYNumber *Number(CYContext &context); + virtual CYString *String(CYContext &context); }; struct CYVariable : @@ -635,6 +754,7 @@ struct CYVariable : CYPrecedence(0) CYRightHand(false) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -651,6 +771,9 @@ struct CYPrefix : virtual bool Alphabetic() const = 0; virtual const char *Operator() const = 0; + CYPrecedence(4) + + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -673,6 +796,7 @@ struct CYInfix : virtual bool Alphabetic() const = 0; virtual const char *Operator() const = 0; + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -688,6 +812,9 @@ struct CYPostfix : virtual const char *Operator() const = 0; + CYPrecedence(3) + + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -709,15 +836,26 @@ struct CYAssignment : virtual const char *Operator() const = 0; + CYPrecedence(16) + + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYArgument : - CYNext + CYNext, + CYThing { CYWord *name_; CYExpression *value_; + CYArgument(CYExpression *value, CYArgument *next = NULL) : + CYNext(next), + name_(NULL), + value_(value) + { + } + CYArgument(CYWord *name, CYExpression *value, CYArgument *next = NULL) : CYNext(next), name_(name), @@ -725,6 +863,7 @@ struct CYArgument : { } + void Replace(CYContext &context); void Output(CYOutput &out) const; }; @@ -742,19 +881,21 @@ struct CYClause : CYNext { CYExpression *case_; - CYStatement *code_; + CYStatement *statements_; - CYClause(CYExpression *_case, CYStatement *code) : + CYClause(CYExpression *_case, CYStatement *statements) : case_(_case), - code_(code) + statements_(statements) { } + void Replace(CYContext &context); virtual void Output(CYOutput &out) const; }; struct CYElement : - CYNext + CYNext, + CYThing { CYExpression *value_; @@ -764,6 +905,7 @@ struct CYElement : { } + void Replace(CYContext &context); void Output(CYOutput &out) const; }; @@ -772,11 +914,12 @@ struct CYArray : { CYElement *elements_; - CYArray(CYElement *elements) : + CYArray(CYElement *elements = NULL) : elements_(elements) { } + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -795,24 +938,31 @@ struct CYDeclaration : virtual void ForIn(CYOutput &out, CYFlags flags) const; virtual const char *ForEachIn() const; - virtual void ForEachIn(CYOutput &out) const; + virtual CYExpression *ForEachIn(CYContext &out); + + void Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYDeclarations : CYNext, - CYForInitialiser + CYForInitialiser, + CYThing { CYDeclaration *declaration_; - CYDeclarations(CYDeclaration *declaration, CYDeclarations *next) : + CYDeclarations(CYDeclaration *declaration, CYDeclarations *next = NULL) : CYNext(next), declaration_(declaration) { } virtual void For(CYOutput &out) const; + + void Replace(CYContext &context); + + virtual void Output(CYOutput &out) const; virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -826,6 +976,7 @@ struct CYVar : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -833,130 +984,18 @@ struct CYLet : CYStatement { CYDeclarations *declarations_; - CYStatement *statements_; + CYBlock code_; CYLet(CYDeclarations *declarations, CYStatement *statements) : declarations_(declarations), - statements_(statements) - { - } - - virtual void Output(CYOutput &out, CYFlags flags) const; -}; - -struct CYField : - CYNext -{ - virtual void Output(CYOutput &out) const; -}; - -struct CYMessageParameter : - CYNext -{ - CYWord *tag_; - CYExpression *type_; - CYIdentifier *name_; - - CYMessageParameter(CYWord *tag, CYExpression *type, CYIdentifier *name) : - tag_(tag), - type_(type), - name_(name) - { - } -}; - -struct CYMessage : - CYNext -{ - bool instance_; - CYExpression *type_; - CYMessageParameter *parameter_; - CYStatement *body_; - - CYMessage(bool instance, CYExpression *type, CYMessageParameter *parameter, CYStatement *body) : - instance_(instance), - type_(type), - parameter_(parameter), - body_(body) - { - } - - virtual void Output(CYOutput &out, bool replace) const; -}; - -struct CYClass { - CYClassName *name_; - CYExpression *super_; - CYField *fields_; - CYMessage *messages_; - - CYClass(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) : - name_(name), - super_(super), - fields_(fields), - messages_(messages) - { - } - - virtual void Output(CYOutput &out, CYFlags flags) const; -}; - -struct CYClassExpression : - CYClass, - CYExpression -{ - CYClassExpression(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) : - CYClass(name, super, fields, messages) - { - } - - CYPrecedence(0) - - virtual void Output(CYOutput &out, CYFlags flags) const; -}; - -struct CYClassStatement : - CYClass, - CYStatement -{ - CYClassStatement(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) : - CYClass(name, super, fields, messages) + code_(statements) { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; -struct CYCategory : - CYStatement -{ - CYClassName *name_; - CYMessage *messages_; - - CYCategory(CYClassName *name, CYMessage *messages) : - name_(name), - messages_(messages) - { - } - - virtual void Output(CYOutput &out, CYFlags flags) const; -}; - -struct CYFunctionParameter : - CYNext, - CYThing -{ - CYIdentifier *name_; - - CYFunctionParameter(CYIdentifier *name, CYFunctionParameter *next) : - CYNext(next), - name_(name) - { - } - - virtual void Output(CYOutput &out) const; -}; - struct CYFor : CYStatement { @@ -973,6 +1012,7 @@ struct CYFor : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -990,6 +1030,7 @@ struct CYForIn : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1007,35 +1048,39 @@ struct CYForEachIn : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYProperty : - CYNext + CYNext, + CYThing { CYPropertyName *name_; CYExpression *value_; - CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next) : + CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next = NULL) : CYNext(next), name_(name), value_(value) { } + void Replace(CYContext &context); virtual void Output(CYOutput &out) const; }; struct CYObject : CYLiteral { - CYProperty *property_; + CYProperty *properties_; - CYObject(CYProperty *property) : - property_(property) + CYObject(CYProperty *properties) : + properties_(properties) { } + virtual CYExpression *Replace(CYContext &context); void Output(CYOutput &out, CYFlags flags) const; }; @@ -1043,34 +1088,18 @@ struct CYCatch : CYThing { CYIdentifier *name_; - CYStatement *code_; + CYBlock code_; - CYCatch(CYIdentifier *name, CYStatement *code) : + CYCatch(CYIdentifier *name, CYStatement *statements) : name_(name), - code_(code) + code_(statements) { } + void Replace(CYContext &context); virtual void Output(CYOutput &out) const; }; -struct CYSend : - CYExpression -{ - CYExpression *self_; - CYArgument *arguments_; - - CYSend(CYExpression *self, CYArgument *arguments) : - self_(self), - arguments_(arguments) - { - } - - CYPrecedence(0) - - virtual void Output(CYOutput &out, CYFlags flags) const; -}; - struct CYMember : CYExpression { @@ -1086,6 +1115,8 @@ struct CYMember : void SetLeft(CYExpression *object) { object_ = object; } + + void Replace_(CYContext &context); }; struct CYDirectMember : @@ -1099,6 +1130,7 @@ struct CYDirectMember : CYPrecedence(1) CYRightHand(false) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1113,6 +1145,7 @@ struct CYIndirectMember : CYPrecedence(1) CYRightHand(false) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1134,6 +1167,7 @@ struct CYNew : CYRightHand(false) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1143,7 +1177,7 @@ struct CYCall : CYExpression *function_; CYArgument *arguments_; - CYCall(CYExpression *function, CYArgument *arguments) : + CYCall(CYExpression *function, CYArgument *arguments = NULL) : function_(function), arguments_(arguments) { @@ -1152,6 +1186,7 @@ struct CYCall : CYPrecedence(1) CYRightHand(false) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1162,13 +1197,14 @@ struct CYIf : CYStatement *true_; CYStatement *false_; - CYIf(CYExpression *test, CYStatement *_true, CYStatement *_false) : + CYIf(CYExpression *test, CYStatement *_true, CYStatement *_false = NULL) : test_(test), true_(_true), false_(_false) { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1184,6 +1220,7 @@ struct CYDoWhile : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1199,21 +1236,23 @@ struct CYWhile : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYFunction { CYIdentifier *name_; CYFunctionParameter *parameters_; - CYStatement *body_; + CYBlock code_; - CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) : + CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) : name_(name), parameters_(parameters), - body_(body) + code_(statements) { } + virtual void Replace_(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1221,14 +1260,15 @@ struct CYFunctionExpression : CYFunction, CYExpression { - CYFunctionExpression(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) : - CYFunction(name, parameters, body) + CYFunctionExpression(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) : + CYFunction(name, parameters, statements) { } CYPrecedence(0) CYRightHand(false) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1236,11 +1276,12 @@ struct CYFunctionStatement : CYFunction, CYStatement { - CYFunctionStatement(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) : - CYFunction(name, parameters, body) + CYFunctionStatement(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) : + CYFunction(name, parameters, statements) { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1254,6 +1295,7 @@ struct CYExpress : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1267,6 +1309,7 @@ struct CYContinue : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1280,6 +1323,7 @@ struct CYBreak : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1293,40 +1337,46 @@ struct CYReturn : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYEmpty : CYStatement { + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; -struct CYFinally { - CYStatement *code_; +struct CYFinally : + CYThing +{ + CYBlock code_; - CYFinally(CYStatement *code) : - code_(code) + CYFinally(CYStatement *statements) : + code_(statements) { } + void Replace(CYContext &context); virtual void Output(CYOutput &out) const; }; struct CYTry : CYStatement { - CYStatement *code_; + CYBlock code_; CYCatch *catch_; CYFinally *finally_; - CYTry(CYStatement *code, CYCatch *_catch, CYFinally *finally) : - code_(code), + CYTry(CYStatement *statements, CYCatch *_catch, CYFinally *finally) : + code_(statements), catch_(_catch), finally_(finally) { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1340,6 +1390,7 @@ struct CYThrow : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1355,6 +1406,7 @@ struct CYWith : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1370,6 +1422,7 @@ struct CYSwitch : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1389,6 +1442,7 @@ struct CYCondition : CYPrecedence(15) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1405,9 +1459,8 @@ struct CYAddressOf : } CYAlphabetic(false) - CYPrecedence(2) - virtual void Output(CYOutput &out, CYFlags flags) const; + virtual CYExpression *Replace(CYContext &context); }; struct CYIndirect : @@ -1423,48 +1476,47 @@ struct CYIndirect : } CYAlphabetic(false) - CYPrecedence(1) - virtual void Output(CYOutput &out, CYFlags flags) const; + virtual CYExpression *Replace(CYContext &context); }; -#define CYPostfix_(op, name) \ +#define CYReplace \ + virtual CYExpression *Replace(CYContext &context); + +#define CYPostfix_(op, name, args...) \ struct CY ## name : \ CYPostfix \ - { \ + { args \ CY ## name(CYExpression *lhs) : \ CYPostfix(lhs) \ { \ } \ - \ - CYPrecedence(3) \ \ virtual const char *Operator() const { \ return op; \ } \ }; -#define CYPrefix_(alphabetic, op, name) \ +#define CYPrefix_(alphabetic, op, name, args...) \ struct CY ## name : \ CYPrefix \ - { \ + { args \ CY ## name(CYExpression *rhs) : \ CYPrefix(rhs) \ { \ } \ \ CYAlphabetic(alphabetic) \ - CYPrecedence(4) \ \ virtual const char *Operator() const { \ return op; \ } \ }; -#define CYInfix_(alphabetic, precedence, op, name) \ +#define CYInfix_(alphabetic, precedence, op, name, args...) \ struct CY ## name : \ CYInfix \ - { \ + { args \ CY ## name(CYExpression *lhs, CYExpression *rhs) : \ CYInfix(lhs, rhs) \ { \ @@ -1478,16 +1530,14 @@ struct CYIndirect : } \ }; -#define CYAssignment_(op, name) \ +#define CYAssignment_(op, name, args...) \ struct CY ## name ## Assign : \ CYAssignment \ - { \ + { args \ CY ## name ## Assign(CYExpression *lhs, CYExpression *rhs) : \ CYAssignment(lhs, rhs) \ { \ } \ - \ - CYPrecedence(16) \ \ virtual const char *Operator() const { \ return op; \ @@ -1502,6 +1552,7 @@ CYPrefix_(true, "void", Void) CYPrefix_(true, "typeof", TypeOf) CYPrefix_(false, "++", PreIncrement) CYPrefix_(false, "--", PreDecrement) +CYPrefix_(false, "+", Affirm) CYPrefix_(false, "-", Negate) CYPrefix_(false, "~", BitwiseNot) CYPrefix_(false, "!", LogicalNot) @@ -1509,7 +1560,7 @@ CYPrefix_(false, "!", LogicalNot) CYInfix_(false, 5, "*", Multiply) CYInfix_(false, 5, "/", Divide) CYInfix_(false, 5, "%", Modulus) -CYInfix_(false, 6, "+", Add) +CYInfix_(false, 6, "+", Add, CYReplace) CYInfix_(false, 6, "-", Subtract) CYInfix_(false, 7, "<<", ShiftLeft) CYInfix_(false, 7, ">>", ShiftRightSigned)