X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/d35a3b07965ee394c89615d9648c45face9f7f07..c0bc320e4e9af4976a1f0e61e44d58d2e230ca5c:/Parser.hpp diff --git a/Parser.hpp b/Parser.hpp index 7de6b02..a9a8812 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 @@ -28,34 +67,60 @@ struct CYNext { }; struct CYThing { - virtual void Output(std::ostream &out) const = 0; -}; + virtual void Output(struct CYOutput &out) const = 0; +}; + +struct CYOutput { + std::ostream &out_; + bool pretty_; + unsigned indent_; + + enum { + NoMode, + NoLetter, + NoPlus, + NoHyphen, + Terminated + } mode_; + + CYOutput(std::ostream &out) : + out_(out), + pretty_(false), + indent_(0), + mode_(NoMode) + { + } -_finline std::ostream &operator <<(std::ostream &out, const CYThing &rhs) { - rhs.Output(out); - return out; -} + void Check(char value); + void Terminate(); -struct CYPart { - virtual void Part(std::ostream &out) const = 0; + CYOutput &operator <<(char rhs); + CYOutput &operator <<(const char *rhs); + + _finline CYOutput &operator <<(const CYThing *rhs) { + if (rhs != NULL) + rhs->Output(*this); + return *this; + } + + _finline CYOutput &operator <<(const CYThing &rhs) { + rhs.Output(*this); + return *this; + } }; -struct CYSource : - CYNext -{ - virtual void Show(std::ostream &out) const; - virtual void Output(std::ostream &out) const = 0; - virtual void Output(std::ostream &out, bool block) const; +struct CYPropertyName { + virtual void PropertyName(CYOutput &out) const = 0; }; -struct CYName : - CYThing -{ - virtual const char *Name() const = 0; +struct CYClassName { + virtual void ClassName(CYOutput &out, bool object) const = 0; }; struct CYWord : - CYName + CYThing, + CYPropertyName, + CYClassName { const char *word_; @@ -68,13 +133,16 @@ struct CYWord : return word_; } - virtual const char *Name() const { - return Value(); - } + virtual void Output(CYOutput &out) const; - virtual void Output(std::ostream &out) const; + 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(); +} + struct CYIdentifier : CYWord { @@ -87,23 +155,64 @@ struct CYIdentifier : struct CYLabel : CYNext { - CYIdentifier *identifier_; + CYIdentifier *name_; - CYLabel(CYIdentifier *identifier, CYLabel *next) : + CYLabel(CYIdentifier *name, CYLabel *next) : CYNext(next), - identifier_(identifier) + name_(name) { } }; +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 CYStatement : - CYSource + CYNext { - CYLabel *label_; + CYLabel *labels_; + + CYStatement() : + labels_(NULL) + { + } void AddLabel(CYIdentifier *identifier) { - label_ = new CYLabel(identifier, label_); + labels_ = new CYLabel(identifier, labels_); + } + + bool Single(CYOutput &out, CYFlags flags) const; + void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const; + + private: + virtual void Output(CYOutput &out, CYFlags flags) const = 0; +}; + +struct CYBlock : + CYStatement +{ + CYStatement *statements_; + + CYBlock(CYStatement *statements) : + statements_(statements) + { } + + virtual void Output(CYOutput &out, CYFlags flags) const; }; enum CYState { @@ -121,17 +230,26 @@ class CYDriver { const char *data_; size_t size_; + FILE *file_; + + bool strict_; + + enum Condition { + RegExStart, + RegExRest + }; std::string filename_; struct Error { + bool warning_; cy::location location_; std::string message_; }; typedef std::vector Errors; - CYSource *source_; + CYStatement *program_; Errors errors_; private: @@ -141,34 +259,67 @@ class CYDriver { public: CYDriver(const std::string &filename); ~CYDriver(); + + void SetCondition(Condition condition); + + void Warning(const cy::location &location, const char *message); }; -struct CYForInitialiser : - CYPart -{ +struct CYForInitialiser { + virtual void For(CYOutput &out) const = 0; }; -struct CYForInInitialiser : - CYPart -{ +struct CYForInInitialiser { + virtual void ForIn(CYOutput &out, CYFlags flags) const = 0; + virtual const char *ForEachIn() const = 0; + virtual void ForEachIn(CYOutput &out) const = 0; }; struct CYExpression : CYNext, CYForInitialiser, - CYForInInitialiser + CYForInInitialiser, + CYClassName, + CYThing { virtual unsigned Precedence() const = 0; - virtual void Part(std::ostream &out) const; - virtual void Output(std::ostream &out) const = 0; - void Output(std::ostream &out, unsigned precedence) const; + + virtual bool RightHand() const { + return true; + } + + virtual void For(CYOutput &out) const; + virtual void ForIn(CYOutput &out, CYFlags flags) const; + + virtual const char *ForEachIn() const; + virtual void ForEachIn(CYOutput &out) const; + + 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 void ClassName(CYOutput &out, bool object) const; + + virtual const char *Word() const { + return NULL; + } }; +#define CYAlphabetic(value) \ + virtual bool Alphabetic() const { \ + return value; \ + } + #define CYPrecedence(value) \ virtual unsigned Precedence() const { \ return value; \ } +#define CYRightHand(value) \ + virtual bool RightHand() const { \ + return value; \ + } + struct CYCompound : CYExpression { @@ -189,17 +340,112 @@ struct CYCompound : CYPrecedence(17) - void Output(std::ostream &out) const; + void Output(CYOutput &out, CYFlags flags) const; +}; + +struct CYComprehension : + 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 { + } +}; + +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_(CYOutput &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_(CYOutput &out) const; + virtual void End_(CYOutput &out) const; +}; + +struct CYIfComprehension : + CYComprehension +{ + CYExpression *test_; + + CYIfComprehension(CYExpression *test) : + test_(test) + { + } + + virtual const char *Name() const { + return NULL; + } + + virtual void Begin_(CYOutput &out) const; +}; + +struct CYArrayComprehension : + CYExpression +{ + CYExpression *expression_; + CYComprehension *comprehensions_; + + CYArrayComprehension(CYExpression *expression, CYComprehension *comprehensions) : + expression_(expression), + comprehensions_(comprehensions) + { + } + + CYPrecedence(0) + + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYLiteral : CYExpression { CYPrecedence(0) + CYRightHand(false) +}; + +struct CYMagic : + CYExpression +{ + CYPrecedence(0) + CYRightHand(false) }; struct CYSelectorPart : - CYNext + CYNext, + CYThing { CYWord *name_; bool value_; @@ -211,7 +457,7 @@ struct CYSelectorPart : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out) const; }; struct CYSelector : @@ -224,12 +470,38 @@ struct CYSelector : { } - virtual void Output(std::ostream &out) const; + CYPrecedence(1) + + virtual void Output(CYOutput &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_; @@ -250,16 +522,15 @@ struct CYString : return value_; } - virtual const char *Name() const { - return Value(); - } + virtual const char *Word() const; - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; + virtual void PropertyName(CYOutput &out) const; }; struct CYNumber : CYLiteral, - CYName + CYPropertyName { double value_; @@ -272,11 +543,25 @@ struct CYNumber : return value_; } - virtual const char *Name() const { - throw; + virtual void Output(CYOutput &out, CYFlags flags) const; + virtual void PropertyName(CYOutput &out) const; +}; + +struct CYRegEx : + CYLiteral +{ + const char *value_; + + CYRegEx(const char *value) : + value_(value) + { + } + + const char *Value() const { + return value_; } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYNull : @@ -288,28 +573,26 @@ struct CYNull : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYThis : CYWord, - CYExpression + CYMagic { CYThis() : CYWord("this") { } - CYPrecedence(0) - - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYBoolean : CYLiteral { virtual bool Value() const = 0; - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYFalse : @@ -351,8 +634,9 @@ struct CYVariable : } CYPrecedence(0) + CYRightHand(false) - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYPrefix : @@ -365,9 +649,10 @@ struct CYPrefix : { } + virtual bool Alphabetic() const = 0; virtual const char *Operator() const = 0; - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYInfix : @@ -382,9 +667,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(CYOutput &out, CYFlags flags) const; }; struct CYPostfix : @@ -399,7 +689,7 @@ struct CYPostfix : virtual const char *Operator() const = 0; - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYAssignment : @@ -414,13 +704,18 @@ struct CYAssignment : { } + void SetLeft(CYExpression *lhs) { + lhs_ = lhs; + } + virtual const char *Operator() const = 0; - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYArgument : - CYNext + CYNext, + CYThing { CYWord *name_; CYExpression *value_; @@ -432,7 +727,7 @@ struct CYArgument : { } - void Output(std::ostream &out) const; + void Output(CYOutput &out) const; }; struct CYBlank : @@ -457,11 +752,12 @@ struct CYClause : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out) const; }; struct CYElement : - CYNext + CYNext, + CYThing { CYExpression *value_; @@ -471,7 +767,7 @@ struct CYElement : { } - void Output(std::ostream &out) const; + void Output(CYOutput &out) const; }; struct CYArray : @@ -484,11 +780,10 @@ struct CYArray : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYDeclaration : - CYThing, CYForInInitialiser { CYIdentifier *identifier_; @@ -500,40 +795,172 @@ struct CYDeclaration : { } - virtual void Part(std::ostream &out) const; - virtual void Output(std::ostream &out) const; + virtual void ForIn(CYOutput &out, CYFlags flags) const; + + virtual const char *ForEachIn() const; + virtual void ForEachIn(CYOutput &out) const; + + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYDeclarations : - CYStatement, - CYForInitialiser + CYNext, + CYForInitialiser, + CYThing { CYDeclaration *declaration_; - CYDeclarations *next_; CYDeclarations(CYDeclaration *declaration, CYDeclarations *next) : - declaration_(declaration), - next_(next) + CYNext(next), + declaration_(declaration) + { + } + + virtual void For(CYOutput &out) const; + + virtual void Output(CYOutput &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; +}; + +struct CYVar : + CYStatement +{ + CYDeclarations *declarations_; + + CYVar(CYDeclarations *declarations) : + declarations_(declarations) + { + } + + virtual void Output(CYOutput &out, CYFlags flags) const; +}; + +struct CYLet : + CYStatement +{ + CYDeclarations *declarations_; + CYStatement *statements_; + + 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) { } - virtual void Part(std::ostream &out) const; - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; -struct CYParameter : - CYNext, +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_; - CYParameter(CYIdentifier *name, CYParameter *next) : - CYNext(next), + CYFunctionParameter(CYIdentifier *name, CYFunctionParameter *next) : + CYNext(next), name_(name) { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out) const; }; struct CYFor : @@ -552,7 +979,7 @@ struct CYFor : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYForIn : @@ -569,23 +996,41 @@ struct CYForIn : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; +}; + +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(CYOutput &out, CYFlags flags) const; }; struct CYProperty : - CYNext + CYNext, + CYThing { - CYName *name_; + CYPropertyName *name_; CYExpression *value_; - CYProperty(CYName *name, CYExpression *value, CYProperty *next) : + CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next) : CYNext(next), name_(name), value_(value) { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out) const; }; struct CYObject : @@ -598,7 +1043,7 @@ struct CYObject : { } - void Output(std::ostream &out) const; + void Output(CYOutput &out, CYFlags flags) const; }; struct CYCatch : @@ -613,16 +1058,16 @@ struct CYCatch : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &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) { @@ -630,7 +1075,7 @@ struct CYMessage : CYPrecedence(0) - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYMember : @@ -645,9 +1090,37 @@ struct CYMember : { } + void SetLeft(CYExpression *object) { + object_ = object; + } +}; + +struct CYDirectMember : + CYMember +{ + CYDirectMember(CYExpression *object, CYExpression *property) : + CYMember(object, property) + { + } + + CYPrecedence(1) + CYRightHand(false) + + virtual void Output(CYOutput &out, CYFlags flags) const; +}; + +struct CYIndirectMember : + CYMember +{ + CYIndirectMember(CYExpression *object, CYExpression *property) : + CYMember(object, property) + { + } + CYPrecedence(1) + CYRightHand(false) - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYNew : @@ -662,9 +1135,13 @@ struct CYNew : { } - CYPrecedence(1) + virtual unsigned Precedence() const { + return arguments_ == NULL ? 2 : 1; + } + + CYRightHand(false) - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYCall : @@ -679,9 +1156,10 @@ struct CYCall : { } - CYPrecedence(2) + CYPrecedence(1) + CYRightHand(false) - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYIf : @@ -698,7 +1176,7 @@ struct CYIf : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYDoWhile : @@ -713,7 +1191,7 @@ struct CYDoWhile : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYWhile : @@ -728,38 +1206,49 @@ struct CYWhile : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; -struct CYLambda : - CYExpression -{ +struct CYFunction { CYIdentifier *name_; - CYParameter *parameters_; - CYSource *body_; + CYFunctionParameter *parameters_; + CYStatement *body_; - CYLambda(CYIdentifier *name, CYParameter *parameters, CYSource *body) : + CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) : name_(name), parameters_(parameters), body_(body) { } + virtual void Output(CYOutput &out, CYFlags flags) const; +}; + +struct CYFunctionExpression : + CYFunction, + CYExpression +{ + CYFunctionExpression(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) : + CYFunction(name, parameters, body) + { + } + CYPrecedence(0) + CYRightHand(false) - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; -struct CYFunction : - CYLambda, - CYSource +struct CYFunctionStatement : + CYFunction, + CYStatement { - CYFunction(CYIdentifier *name, CYParameter *parameters, CYSource *body) : - CYLambda(name, parameters, body) + CYFunctionStatement(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) : + CYFunction(name, parameters, body) { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYExpress : @@ -772,7 +1261,7 @@ struct CYExpress : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYContinue : @@ -785,7 +1274,7 @@ struct CYContinue : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYBreak : @@ -798,7 +1287,7 @@ struct CYBreak : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYReturn : @@ -811,31 +1300,43 @@ struct CYReturn : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYEmpty : CYStatement { - virtual void Output(std::ostream &out) const; - virtual void Output(std::ostream &out, bool block) const; + virtual void Output(CYOutput &out, CYFlags flags) const; +}; + +struct CYFinally : + CYThing +{ + CYStatement *code_; + + CYFinally(CYStatement *code) : + code_(code) + { + } + + virtual void Output(CYOutput &out) const; }; struct CYTry : CYStatement { - CYStatement *try_; + CYStatement *code_; CYCatch *catch_; - CYStatement *finally_; + CYFinally *finally_; - CYTry(CYStatement *_try, CYCatch *_catch, CYStatement *finally) : - try_(_try), + CYTry(CYStatement *code, CYCatch *_catch, CYFinally *finally) : + code_(code), catch_(_catch), finally_(finally) { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYThrow : @@ -848,7 +1349,7 @@ struct CYThrow : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYWith : @@ -863,7 +1364,7 @@ struct CYWith : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYSwitch : @@ -878,7 +1379,7 @@ struct CYSwitch : { } - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYCondition : @@ -889,6 +1390,7 @@ struct CYCondition : CYExpression *false_; CYCondition(CYExpression *test, CYExpression *_true, CYExpression *_false) : + test_(test), true_(_true), false_(_false) { @@ -896,7 +1398,7 @@ struct CYCondition : CYPrecedence(15) - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYAddressOf : @@ -911,9 +1413,10 @@ struct CYAddressOf : return "&"; } + CYAlphabetic(false) CYPrecedence(2) - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; struct CYIndirect : @@ -928,9 +1431,10 @@ struct CYIndirect : return "*"; } + CYAlphabetic(false) CYPrecedence(1) - virtual void Output(std::ostream &out) const; + virtual void Output(CYOutput &out, CYFlags flags) const; }; #define CYPostfix_(op, name) \ @@ -949,7 +1453,7 @@ struct CYIndirect : } \ }; -#define CYPrefix_(op, name) \ +#define CYPrefix_(alphabetic, op, name) \ struct CY ## name : \ CYPrefix \ { \ @@ -958,6 +1462,7 @@ struct CYIndirect : { \ } \ \ + CYAlphabetic(alphabetic) \ CYPrecedence(4) \ \ virtual const char *Operator() const { \ @@ -965,7 +1470,7 @@ struct CYIndirect : } \ }; -#define CYInfix_(precedence, op, name) \ +#define CYInfix_(alphabetic, precedence, op, name) \ struct CY ## name : \ CYInfix \ { \ @@ -974,6 +1479,7 @@ struct CYIndirect : { \ } \ \ + CYAlphabetic(alphabetic) \ CYPrecedence(precedence) \ \ virtual const char *Operator() const { \ @@ -1000,38 +1506,39 @@ 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_(5, "*", Multiply) -CYInfix_(5, "/", Divide) -CYInfix_(5, "%", Modulus) -CYInfix_(6, "+", Add) -CYInfix_(6, "-", Subtract) -CYInfix_(7, "<<", ShiftLeft) -CYInfix_(7, ">>", ShiftRightSigned) -CYInfix_(7, ">>>", ShiftRightUnsigned) -CYInfix_(8, "<", Less) -CYInfix_(8, ">", Greater) -CYInfix_(8, "<=", LessOrEqual) -CYInfix_(8, ">=", GreaterOrEqual) -CYInfix_(8, "instanceof", InstanceOf) -CYInfix_(8, "in", In) -CYInfix_(9, "==", Equal) -CYInfix_(9, "!=", NotEqual) -CYInfix_(9, "===", Identical) -CYInfix_(9, "!==", NotIdentical) -CYInfix_(10, "&", BitwiseAnd) -CYInfix_(11, "^", BitwiseXOr) -CYInfix_(12, "|", BitwiseOr) -CYInfix_(13, "&&", LogicalAnd) -CYInfix_(14, "||", LogicalOr) +CYPrefix_(true, "delete", Delete) +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) + +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)