X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/c0bc320e4e9af4976a1f0e61e44d58d2e230ca5c..1504c9b837a7561d8ae2c81f1c4d57fe0f138781:/Parser.hpp diff --git a/Parser.hpp b/Parser.hpp index a9a8812..a994ead 100644 --- a/Parser.hpp +++ b/Parser.hpp @@ -1,4 +1,4 @@ -/* Cycript - Remove Execution Server and Disassembler +/* Cycript - Inlining/Optimizing JavaScript Compiler * Copyright (C) 2009 Jay Freeman (saurik) */ @@ -40,12 +40,24 @@ #ifndef CYPARSER_HPP #define CYPARSER_HPP -#include <cstdlib> +// XXX: wtf is this here?! +#define CYPA 16 + +#include <iostream> + #include <string> #include <vector> +#include <map> +#include <set> + +#include <cstdio> +#include <cstdlib> #include "location.hh" #include "Pooling.hpp" +#include "Options.hpp" + +class CYContext; template <typename Type_> struct CYNext { @@ -67,13 +79,18 @@ struct CYNext { }; struct CYThing { + virtual ~CYThing() { + } + virtual void Output(struct CYOutput &out) const = 0; }; struct CYOutput { std::ostream &out_; + CYOptions &options_; bool pretty_; unsigned indent_; + bool right_; enum { NoMode, @@ -83,10 +100,12 @@ struct CYOutput { Terminated } mode_; - CYOutput(std::ostream &out) : + CYOutput(std::ostream &out, CYOptions &options) : out_(out), + options_(options), pretty_(false), indent_(0), + right_(false), mode_(NoMode) { } @@ -111,9 +130,83 @@ struct CYOutput { struct CYPropertyName { virtual void PropertyName(CYOutput &out) const = 0; + + virtual ~CYPropertyName() { + } +}; + +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), + CYNoInteger = (1 << 6), + CYNoBF = (CYNoBrace | CYNoFunction), +}; + +struct CYStatement : + CYNext<CYStatement> +{ + virtual ~CYStatement() { + } + + void Single(CYOutput &out, CYFlags flags) const; + void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const; + + CYStatement *ReplaceAll(CYContext &context); + virtual CYStatement *Collapse(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 ~CYClassName() { + } + + virtual CYExpression *ClassName(CYContext &context, bool object) = 0; virtual void ClassName(CYOutput &out, bool object) const = 0; }; @@ -129,81 +222,173 @@ struct CYWord : { } - const char *Value() const { - return word_; + void Set(const char *value) { + word_ = value; } + virtual const char *Word() const; 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; }; _finline std::ostream &operator <<(std::ostream &lhs, const CYWord &rhs) { - return lhs << rhs.Value(); + lhs << &rhs << '='; + return lhs << rhs.Word(); } struct CYIdentifier : + CYNext<CYIdentifier>, CYWord { + CYIdentifier *replace_; + size_t offset_; + size_t usage_; + CYIdentifier(const char *word) : - CYWord(word) + CYWord(word), + replace_(NULL), + offset_(0), + usage_(0) { } + + virtual const char *Word() const; + CYIdentifier *Replace(CYContext &context); +}; + +struct CYComment : + CYStatement +{ + const char *value_; + + CYComment(const char *value) : + value_(value) + { + } + + virtual CYStatement *Replace(CYContext &context); + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYLabel : - CYNext<CYLabel> + CYStatement { CYIdentifier *name_; + CYStatement *statement_; - CYLabel(CYIdentifier *name, CYLabel *next) : - CYNext<CYLabel>(next), - name_(name) + CYLabel(CYIdentifier *name, CYStatement *statement) : + name_(name), + statement_(statement) { } + + virtual CYStatement *Replace(CYContext &context); + virtual void Output(CYOutput &out, CYFlags flags) const; }; -enum CYNeeded { - CYNever = -1, - CYSometimes = 0, - CYAlways = 1, +struct CYCStringLess : + std::binary_function<const char *, const char *, bool> +{ + _finline bool operator ()(const char *lhs, const char *rhs) const { + return strcmp(lhs, rhs) < 0; + } }; -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 CYIdentifierValueLess : + std::binary_function<CYIdentifier *, CYIdentifier *, bool> +{ + _finline bool operator ()(CYIdentifier *lhs, CYIdentifier *rhs) const { + return CYCStringLess()(lhs->Word(), rhs->Word()); + } }; -struct CYStatement : - CYNext<CYStatement> +enum CYIdentifierFlags { + CYIdentifierArgument, + CYIdentifierVariable, + CYIdentifierOther, + CYIdentifierMagic, +}; + +typedef std::set<const char *, CYCStringLess> CYCStringSet; +typedef std::set<CYIdentifier *, CYIdentifierValueLess> CYIdentifierValueSet; +typedef std::map<CYIdentifier *, CYIdentifierFlags> CYIdentifierAddressFlagsMap; + +struct CYIdentifierUsage { + CYIdentifier *identifier_; + size_t usage_; +}; + +typedef std::vector<CYIdentifierUsage> CYIdentifierUsageVector; + +struct CYScope { + CYScope *parent_; + + CYIdentifierAddressFlagsMap internal_; + CYIdentifierValueSet identifiers_; + + CYScope() : + parent_(NULL) + { + } + + virtual ~CYScope() { + } + + void Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags); + virtual CYIdentifier *Lookup(CYContext &context, CYIdentifier *identifier); + void Merge(CYContext &context, CYIdentifier *identifier); + void Scope(CYContext &context, CYStatement *&statements); +}; + +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 void Replace(CYContext &context); + virtual void Output(CYOutput &out) const; +}; + +struct CYContext { + apr_pool_t *pool_; + CYOptions &options_; + CYScope *scope_; + CYIdentifierUsageVector rename_; + + CYContext(apr_pool_t *pool, CYOptions &options) : + pool_(pool), + options_(options), + scope_(NULL) + { } - bool Single(CYOutput &out, CYFlags flags) const; - void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const; + virtual ~CYContext() { + } - private: - virtual void Output(CYOutput &out, CYFlags flags) const = 0; + template <typename Type_> + void Replace(Type_ *&value) { + for (;;) if (value == NULL) + break; + else { + Type_ *replace(value->Replace(*this)); + if (replace != value) + value = replace; + else break; + } + } }; struct CYBlock : - CYStatement + CYStatement, + CYThing { CYStatement *statements_; @@ -212,6 +397,21 @@ struct CYBlock : { } + operator CYStatement *() const { + return statements_; + } + + void AddPrev(CYStatement *statement) { + CYStatement *last(statement); + while (last->next_ != NULL) + last = last->next_; + last->SetNext(statements_); + statements_ = statement; + } + + virtual CYStatement *Replace(CYContext &context); + + virtual void Output(CYOutput &out) const; virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -235,8 +435,9 @@ class CYDriver { bool strict_; enum Condition { - RegExStart, - RegExRest + RegExpCondition, + XMLContentCondition, + XMLTagCondition, }; std::string filename_; @@ -249,32 +450,74 @@ class CYDriver { typedef std::vector<Error> Errors; - CYStatement *program_; + 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_; + private: void ScannerInit(); void ScannerDestroy(); public: - CYDriver(const std::string &filename); + CYDriver(apr_pool_t *pool = NULL, 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); }; struct CYForInitialiser { + virtual ~CYForInitialiser() { + } + virtual void For(CYOutput &out) const = 0; + virtual CYExpression *Replace(CYContext &context) = 0; }; struct CYForInInitialiser { + virtual ~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; + virtual CYExpression *Replace(CYContext &context) = 0; }; +struct CYNumber; +struct CYString; + struct CYExpression : CYNext<CYExpression>, CYForInitialiser, @@ -292,14 +535,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; } @@ -325,7 +585,7 @@ struct CYCompound : { CYExpression *expressions_; - CYCompound(CYExpression *expressions) : + CYCompound(CYExpression *expressions = NULL) : expressions_(expressions) { } @@ -340,20 +600,36 @@ struct CYCompound : CYPrecedence(17) + virtual CYExpression *Replace(CYContext &context); void Output(CYOutput &out, CYFlags flags) const; }; +struct CYFunctionParameter : + CYNext<CYFunctionParameter>, + CYThing +{ + CYIdentifier *name_; + + CYFunctionParameter(CYIdentifier *name, CYFunctionParameter *next = NULL) : + CYNext<CYFunctionParameter>(next), + name_(name) + { + } + + void Replace(CYContext &context); + virtual void Output(CYOutput &out) const; +}; + struct CYComprehension : CYNext<CYComprehension>, 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 : @@ -369,10 +645,12 @@ struct CYForInComprehension : } virtual const char *Name() const { - return name_->Value(); + return name_->Word(); } - 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 : @@ -388,11 +666,12 @@ struct CYForEachInComprehension : } virtual const char *Name() const { - return name_->Value(); + return name_->Word(); } - 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 +688,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 +707,7 @@ struct CYArrayComprehension : CYPrecedence(0) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -436,6 +718,12 @@ struct CYLiteral : CYRightHand(false) }; +struct CYTrivial : + CYLiteral +{ + virtual CYExpression *Replace(CYContext &context); +}; + struct CYMagic : CYExpression { @@ -443,38 +731,6 @@ struct CYMagic : CYRightHand(false) }; -struct CYSelectorPart : - CYNext<CYSelectorPart>, - CYThing -{ - CYWord *name_; - bool value_; - - CYSelectorPart(CYWord *name, bool value, CYSelectorPart *next) : - CYNext<CYSelectorPart>(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_; @@ -500,20 +756,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->Word()), size_(strlen(value_)) { } @@ -524,12 +792,16 @@ struct CYString : virtual const char *Word() const; + virtual CYNumber *Number(CYContext &context); + virtual CYString *String(CYContext &context); + + 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_; @@ -543,12 +815,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_; @@ -566,13 +841,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; }; @@ -585,11 +863,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; @@ -607,6 +886,9 @@ struct CYFalse : virtual bool Value() const { return false; } + + virtual CYNumber *Number(CYContext &context); + virtual CYString *String(CYContext &context); }; struct CYTrue : @@ -621,6 +903,9 @@ struct CYTrue : virtual bool Value() const { return true; } + + virtual CYNumber *Number(CYContext &context); + virtual CYString *String(CYContext &context); }; struct CYVariable : @@ -636,6 +921,7 @@ struct CYVariable : CYPrecedence(0) CYRightHand(false) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -652,6 +938,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; }; @@ -674,6 +963,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; }; @@ -689,6 +979,9 @@ struct CYPostfix : virtual const char *Operator() const = 0; + CYPrecedence(3) + + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -710,6 +1003,9 @@ struct CYAssignment : virtual const char *Operator() const = 0; + CYPrecedence(16) + + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -720,6 +1016,13 @@ struct CYArgument : CYWord *name_; CYExpression *value_; + CYArgument(CYExpression *value, CYArgument *next = NULL) : + CYNext<CYArgument>(next), + name_(NULL), + value_(value) + { + } + CYArgument(CYWord *name, CYExpression *value, CYArgument *next = NULL) : CYNext<CYArgument>(next), name_(name), @@ -727,6 +1030,7 @@ struct CYArgument : { } + void Replace(CYContext &context); void Output(CYOutput &out) const; }; @@ -744,14 +1048,15 @@ struct CYClause : CYNext<CYClause> { 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; }; @@ -767,6 +1072,7 @@ struct CYElement : { } + void Replace(CYContext &context); void Output(CYOutput &out) const; }; @@ -775,21 +1081,40 @@ 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; }; +struct CYProperty : + CYNext<CYProperty>, + CYThing +{ + CYPropertyName *name_; + CYExpression *value_; + + CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next = NULL) : + CYNext<CYProperty>(next), + name_(name), + value_(value) + { + } + + void Replace(CYContext &context); + virtual void Output(CYOutput &out) const; +}; + struct CYDeclaration : CYForInInitialiser { CYIdentifier *identifier_; CYExpression *initialiser_; - CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser) : + CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser = NULL) : identifier_(identifier), initialiser_(initialiser) { @@ -798,19 +1123,22 @@ 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); + + virtual CYExpression *Replace(CYContext &context); + virtual CYAssignment *Assignment(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYDeclarations : CYNext<CYDeclarations>, - CYForInitialiser, - CYThing + CYThing, + CYForInitialiser { CYDeclaration *declaration_; - CYDeclarations(CYDeclaration *declaration, CYDeclarations *next) : + CYDeclarations(CYDeclaration *declaration, CYDeclarations *next = NULL) : CYNext<CYDeclarations>(next), declaration_(declaration) { @@ -818,6 +1146,9 @@ struct CYDeclarations : virtual void For(CYOutput &out) const; + virtual CYCompound *Replace(CYContext &context); + CYProperty *Property(CYContext &context); + virtual void Output(CYOutput &out) const; virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -832,6 +1163,7 @@ struct CYVar : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -839,130 +1171,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<CYField> -{ - virtual void Output(CYOutput &out) const; -}; - -struct CYMessageParameter : - CYNext<CYMessageParameter> -{ - CYWord *tag_; - CYExpression *type_; - CYIdentifier *name_; - - CYMessageParameter(CYWord *tag, CYExpression *type, CYIdentifier *name) : - tag_(tag), - type_(type), - name_(name) - { - } -}; - -struct CYMessage : - CYNext<CYMessage> -{ - 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<CYFunctionParameter>, - CYThing -{ - CYIdentifier *name_; - - CYFunctionParameter(CYIdentifier *name, CYFunctionParameter *next) : - CYNext<CYFunctionParameter>(next), - name_(name) - { - } - - virtual void Output(CYOutput &out) const; -}; - struct CYFor : CYStatement { @@ -979,6 +1199,7 @@ struct CYFor : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -996,6 +1217,7 @@ struct CYForIn : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1013,71 +1235,24 @@ struct CYForEachIn : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; -struct CYProperty : - CYNext<CYProperty>, - CYThing -{ - CYPropertyName *name_; - CYExpression *value_; - - CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next) : - CYNext<CYProperty>(next), - name_(name), - value_(value) - { - } - - 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; }; -struct CYCatch : - CYThing -{ - CYIdentifier *name_; - CYStatement *code_; - - CYCatch(CYIdentifier *name, CYStatement *code) : - name_(name), - code_(code) - { - } - - 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 { @@ -1093,6 +1268,8 @@ struct CYMember : void SetLeft(CYExpression *object) { object_ = object; } + + void Replace_(CYContext &context); }; struct CYDirectMember : @@ -1106,6 +1283,7 @@ struct CYDirectMember : CYPrecedence(1) CYRightHand(false) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1120,6 +1298,7 @@ struct CYIndirectMember : CYPrecedence(1) CYRightHand(false) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1141,6 +1320,7 @@ struct CYNew : CYRightHand(false) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1150,7 +1330,7 @@ struct CYCall : CYExpression *function_; CYArgument *arguments_; - CYCall(CYExpression *function, CYArgument *arguments) : + CYCall(CYExpression *function, CYArgument *arguments = NULL) : function_(function), arguments_(arguments) { @@ -1159,6 +1339,7 @@ struct CYCall : CYPrecedence(1) CYRightHand(false) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1169,13 +1350,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; }; @@ -1191,6 +1373,7 @@ struct CYDoWhile : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1206,21 +1389,27 @@ 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 ~CYFunction() { + } + + void Inject(CYContext &context); + virtual void Replace_(CYContext &context, bool outer); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1228,14 +1417,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; }; @@ -1243,11 +1433,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; }; @@ -1259,8 +1450,12 @@ struct CYExpress : CYExpress(CYExpression *expression) : expression_(expression) { + if (expression == NULL) + throw; } + virtual CYStatement *Collapse(CYContext &context); + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1274,6 +1469,7 @@ struct CYContinue : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1287,6 +1483,7 @@ struct CYBreak : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1300,58 +1497,85 @@ struct CYReturn : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYEmpty : CYStatement { + virtual CYStatement *Collapse(CYContext &context); + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYFinally : CYThing { - CYStatement *code_; + CYBlock code_; - CYFinally(CYStatement *code) : - code_(code) + CYFinally(CYStatement *statements) : + code_(statements) + { + } + + void Replace(CYContext &context); + virtual void Output(CYOutput &out) const; +}; + +namespace cy { +namespace Syntax { + +struct Catch : + CYThing +{ + CYIdentifier *name_; + CYBlock code_; + + Catch(CYIdentifier *name, CYStatement *statements) : + name_(name), + code_(statements) { } + void Replace(CYContext &context); virtual void Output(CYOutput &out) const; }; -struct CYTry : +struct Try : CYStatement { - CYStatement *code_; - CYCatch *catch_; + CYBlock code_; + Catch *catch_; CYFinally *finally_; - CYTry(CYStatement *code, CYCatch *_catch, CYFinally *finally) : - code_(code), + Try(CYStatement *statements, Catch *_catch, CYFinally *finally) : + code_(statements), catch_(_catch), finally_(finally) { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; -struct CYThrow : +struct Throw : CYStatement { CYExpression *value_; - CYThrow(CYExpression *value) : + Throw(CYExpression *value) : value_(value) { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; +} } + struct CYWith : CYStatement { @@ -1364,6 +1588,7 @@ struct CYWith : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1379,6 +1604,7 @@ struct CYSwitch : { } + virtual CYStatement *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1398,6 +1624,7 @@ struct CYCondition : CYPrecedence(15) + virtual CYExpression *Replace(CYContext &context); virtual void Output(CYOutput &out, CYFlags flags) const; }; @@ -1414,9 +1641,8 @@ struct CYAddressOf : } CYAlphabetic(false) - CYPrecedence(2) - virtual void Output(CYOutput &out, CYFlags flags) const; + virtual CYExpression *Replace(CYContext &context); }; struct CYIndirect : @@ -1432,48 +1658,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) \ { \ @@ -1487,16 +1712,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; \ @@ -1519,7 +1742,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)