-/* Cycript - Remove Execution Server and Disassembler
- * Copyright (C) 2009 Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2012 Jay Freeman (saurik)
*/
-/* Modified BSD License {{{ */
+/* GNU Lesser General Public License, Version 3 {{{ */
/*
- * Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * Cycript is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
*
- * 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.
+ * Cycript is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
*
- * 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.
-*/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript. If not, see <http://www.gnu.org/licenses/>.
+**/
/* }}} */
-#ifndef CYPARSER_HPP
-#define CYPARSER_HPP
+#ifndef CYCRIPT_PARSER_HPP
+#define CYCRIPT_PARSER_HPP
-#include <cstdlib>
+#include <iostream>
+
+#include <stack>
#include <string>
#include <vector>
+#include <map>
+#include <set>
-#include "location.hh"
-#include "Pooling.hpp"
+#include <cstdio>
+#include <cstdlib>
-template <typename Type_>
-struct CYNext {
- Type_ *next_;
+#include "location.hh"
- CYNext() :
- next_(NULL)
- {
- }
+#include "List.hpp"
+#include "Pooling.hpp"
+#include "Options.hpp"
- CYNext(Type_ *next) :
- next_(next)
- {
- }
+class CYContext;
- void SetNext(Type_ *next) {
- next_ = next;
+struct CYThing {
+ virtual ~CYThing() {
}
-};
-struct CYThing {
virtual void Output(struct CYOutput &out) const = 0;
};
struct CYOutput {
std::ostream &out_;
-
- CYOutput(std::ostream &out) :
- out_(out)
- {
- }
-
- _finline CYOutput &operator <<(char rhs) {
- out_ << rhs;
- return *this;
- }
-
- _finline CYOutput &operator <<(const char *rhs) {
- out_ << rhs;
+ CYOptions &options_;
+ bool pretty_;
+ unsigned indent_;
+ bool right_;
+
+ enum {
+ NoMode,
+ NoLetter,
+ NoPlus,
+ NoHyphen,
+ Terminated
+ } mode_;
+
+ CYOutput(std::ostream &out, CYOptions &options) :
+ out_(out),
+ options_(options),
+ pretty_(false),
+ indent_(0),
+ right_(false),
+ mode_(NoMode)
+ {
+ }
+
+ void Check(char value);
+ void Terminate();
+
+ CYOutput &operator <<(char rhs);
+ CYOutput &operator <<(const char *rhs);
+
+ _finline CYOutput &operator <<(const CYThing *rhs) {
+ if (rhs != NULL)
+ rhs->Output(*this);
return *this;
}
}
};
-struct CYSource :
- CYNext<CYSource>
+struct CYPropertyName {
+ virtual void PropertyName(CYOutput &out) const = 0;
+
+ virtual ~CYPropertyName() {
+ }
+};
+
+struct CYExpression;
+struct CYAssignment;
+
+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),
+};
+
+_finline CYFlags operator ~(CYFlags rhs) {
+ return static_cast<CYFlags>(~static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags operator &(CYFlags lhs, CYFlags rhs) {
+ return static_cast<CYFlags>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags operator |(CYFlags lhs, CYFlags rhs) {
+ return static_cast<CYFlags>(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags &operator |=(CYFlags &lhs, CYFlags rhs) {
+ return lhs = lhs | rhs;
+}
+
+_finline CYFlags CYLeft(CYFlags flags) {
+ return flags & ~(CYNoDangle | CYNoInteger);
+}
+
+_finline CYFlags CYRight(CYFlags flags) {
+ return flags & ~CYNoBF;
+}
+
+_finline CYFlags CYCenter(CYFlags flags) {
+ return CYLeft(CYRight(flags));
+}
+
+struct CYStatement :
+ CYNext<CYStatement>
{
- virtual bool IsBlock() const {
- return next_ != NULL;
+ virtual ~CYStatement() {
}
- virtual void Show(CYOutput &out) const;
- virtual void Output(CYOutput &out) const = 0;
- virtual void Output(CYOutput &out, bool block) const;
- virtual void Output_(CYOutput &out) const;
+ void Single(CYOutput &out, CYFlags flags) const;
+ void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
+
+ virtual CYStatement *Replace(CYContext &context) = 0;
+
+ private:
+ virtual void Output(CYOutput &out, CYFlags flags) const = 0;
};
-struct CYPropertyName {
- virtual void PropertyName(CYOutput &out) 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;
};
{
}
- 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;
};
-struct CYStatement :
- CYSource
+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;
+ }
+};
+
+struct CYIdentifierValueLess :
+ std::binary_function<CYIdentifier *, CYIdentifier *, bool>
+{
+ _finline bool operator ()(CYIdentifier *lhs, CYIdentifier *rhs) const {
+ return CYCStringLess()(lhs->Word(), rhs->Word());
+ }
+};
+
+enum CYIdentifierFlags {
+ CYIdentifierArgument,
+ CYIdentifierVariable,
+ CYIdentifierOther,
+ CYIdentifierMagic,
+ CYIdentifierCatch,
+};
+
+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 {
+ bool transparent_;
+
+ CYContext &context_;
+ CYStatement *&statements_;
+
+ CYScope *parent_;
+
+ CYIdentifierAddressFlagsMap internal_;
+ CYIdentifierValueSet identifiers_;
+
+ CYScope(bool transparent, CYContext &context, CYStatement *&statements);
+ virtual ~CYScope();
+
+ void Close();
+
+ 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_;
+
+ CYProgram(CYStatement *statements) :
+ statements_(statements)
+ {
+ }
+
+ virtual void Replace(CYContext &context);
+ virtual void Output(CYOutput &out) const;
+};
+
+struct CYNonLocal;
+struct CYThisScope;
+
+struct CYContext {
+ CYOptions &options_;
+
+ CYScope *scope_;
+ CYThisScope *this_;
- CYStatement() :
- labels_(NULL)
+ CYIdentifierUsageVector rename_;
+
+ CYNonLocal *nonlocal_;
+ CYNonLocal *nextlocal_;
+ unsigned unique_;
+
+ CYContext(CYOptions &options) :
+ options_(options),
+ scope_(NULL),
+ this_(NULL),
+ nonlocal_(NULL),
+ nextlocal_(NULL),
+ unique_(0)
{
}
- void AddLabel(CYIdentifier *identifier) {
- labels_ = new CYLabel(identifier, labels_);
+ virtual ~CYContext() {
+ }
+
+ template <typename Type_>
+ void ReplaceAll(Type_ *&values) {
+ Type_ **last(&values);
+ CYForEach (next, values) {
+ Replace(*last = next);
+ if (*last != NULL)
+ last = &(*last)->next_;
+ }
}
- virtual void Output_(CYOutput &out) const;
+ 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;
+ }
+ }
+
+ void NonLocal(CYStatement *&statements);
+ CYIdentifier *Unique();
+};
+
+struct CYNonLocal {
+ CYIdentifier *identifier_;
+
+ CYNonLocal() :
+ identifier_(NULL)
+ {
+ }
+
+ CYIdentifier *Target(CYContext &context) {
+ if (identifier_ == NULL)
+ identifier_ = context.Unique();
+ return identifier_;
+ }
+};
+
+struct CYThisScope :
+ CYNext<CYThisScope>
+{
+ CYIdentifier *identifier_;
+
+ CYThisScope() :
+ identifier_(NULL)
+ {
+ }
+
+ CYIdentifier *Identifier(CYContext &context) {
+ if (next_ != NULL)
+ return next_->Identifier(context);
+ if (identifier_ == NULL)
+ identifier_ = context.Unique();
+ return identifier_;
+ }
};
struct CYBlock :
- CYStatement
+ CYStatement,
+ CYThing
{
CYStatement *statements_;
{
}
- virtual bool IsBlock() const {
- return true;
+ operator CYStatement *() const {
+ return statements_;
}
+ void AddPrev(CYStatement *statement) {
+ CYSetLast(statement) = statements_;
+ statements_ = statement;
+ }
+
+ virtual CYStatement *Replace(CYContext &context);
+
virtual void Output(CYOutput &out) const;
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
enum CYState {
CYNewLine
};
+class CYStream :
+ public std::istream
+{
+ private:
+ class CYBuffer :
+ public std::streambuf
+ {
+ public:
+ CYBuffer(const char *start, const char *end) {
+ setg(const_cast<char *>(start), const_cast<char *>(start), const_cast<char *>(end));
+ }
+ } buffer_;
+
+ public:
+ CYStream(const char *start, const char *end) :
+ std::istream(&buffer_),
+ buffer_(start, end)
+ {
+ }
+};
+
class CYDriver {
public:
- CYPool pool_;
+ void *scanner_;
CYState state_;
- void *scanner_;
+ std::stack<bool> in_;
- const char *data_;
- size_t size_;
- FILE *file_;
+ struct {
+ bool AtImplementation;
+ bool Function;
+ bool OpenBrace;
+ } no_;
+
+ std::istream &data_;
+
+ bool strict_;
enum Condition {
- RegExStart,
- RegExRest
+ RegExpCondition,
+ XMLContentCondition,
+ XMLTagCondition,
};
std::string filename_;
struct Error {
+ bool warning_;
cy::location location_;
std::string message_;
};
typedef std::vector<Error> Errors;
- CYSource *source_;
+ 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(std::istream &data, const std::string &filename = "");
~CYDriver();
+ Condition GetCondition();
void SetCondition(Condition condition);
-};
-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),
+ void PushCondition(Condition condition);
+ void PopCondition();
+
+ void Warning(const cy::location &location, const char *message);
};
struct CYForInitialiser {
- virtual void For(CYOutput &out) const = 0;
+ virtual ~CYForInitialiser() {
+ }
+
+ virtual CYExpression *Replace(CYContext &context) = 0;
+ virtual void Output(CYOutput &out, CYFlags flags) const = 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 CYStatement *ForEachIn(CYContext &out, CYExpression *value) = 0;
+
+ virtual CYExpression *Replace(CYContext &context) = 0;
+ virtual CYAssignment *Assignment(CYContext &context) = 0;
+
+ virtual void Output(CYOutput &out, CYFlags flags) const = 0;
};
+struct CYNumber;
+struct CYString;
+
struct CYExpression :
CYNext<CYExpression>,
CYForInitialiser,
CYForInInitialiser,
- CYClassName
+ CYClassName,
+ CYThing
{
virtual unsigned Precedence() const = 0;
- virtual void For(CYOutput &out) const;
+ virtual bool RightHand() const {
+ return true;
+ }
+
virtual void ForIn(CYOutput &out, CYFlags flags) const;
+ virtual CYStatement *ForEachIn(CYContext &out, CYExpression *value);
- virtual const char *ForEachIn() const;
- virtual void ForEachIn(CYOutput &out) const;
+ virtual CYExpression *AddArgument(CYContext &context, CYExpression *value);
+ 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;
+ virtual CYExpression *Replace(CYContext &context) = 0;
+ virtual CYAssignment *Assignment(CYContext &context);
+
+ 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;
}
}
#define CYPrecedence(value) \
+ static const unsigned Precedence_ = value; \
virtual unsigned Precedence() const { \
+ return Precedence_; \
+ }
+
+#define CYRightHand(value) \
+ virtual bool RightHand() const { \
return value; \
}
{
CYExpression *expressions_;
- CYCompound(CYExpression *expressions) :
+ CYCompound(CYExpression *expressions = NULL) :
expressions_(expressions)
{
}
void AddPrev(CYExpression *expression) {
- CYExpression *last(expression);
- while (last->next_ != NULL)
- last = last->next_;
- last->SetNext(expressions_);
+ CYSetLast(expression) = expressions_;
expressions_ = expression;
}
CYPrecedence(17)
+ virtual CYExpression *Replace(CYContext &context);
void Output(CYOutput &out, CYFlags flags) const;
+
+ virtual CYExpression *Primitive(CYContext &context);
};
-struct CYComprehension :
- CYNext<CYComprehension>
+struct CYDeclaration;
+
+struct CYFunctionParameter :
+ CYNext<CYFunctionParameter>,
+ CYThing
{
- void Output(CYOutput &out) const;
- virtual const char *Name() const = 0;
+ CYForInInitialiser *initialiser_;
- virtual void Begin_(CYOutput &out) const = 0;
+ CYFunctionParameter(CYForInInitialiser *initialiser, CYFunctionParameter *next = NULL) :
+ CYNext<CYFunctionParameter>(next),
+ initialiser_(initialiser)
+ {
+ }
- virtual void End_(CYOutput &out) const {
+ void Replace(CYContext &context, CYBlock &code);
+ void Output(CYOutput &out) const;
+};
+
+struct CYComprehension :
+ CYNext<CYComprehension>,
+ CYThing
+{
+ CYComprehension(CYComprehension *next = NULL) :
+ CYNext<CYComprehension>(next)
+ {
}
+
+ virtual const char *Name() const = 0;
+
+ 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 :
CYIdentifier *name_;
CYExpression *set_;
- CYForInComprehension(CYIdentifier *name, CYExpression *set) :
+ CYForInComprehension(CYIdentifier *name, CYExpression *set, CYComprehension *next = NULL) :
+ CYComprehension(next),
name_(name),
set_(set)
{
}
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 :
+struct CYForOfComprehension :
CYComprehension
{
CYIdentifier *name_;
CYExpression *set_;
- CYForEachInComprehension(CYIdentifier *name, CYExpression *set) :
+ CYForOfComprehension(CYIdentifier *name, CYExpression *set, CYComprehension *next = NULL) :
+ CYComprehension(next),
name_(name),
set_(set)
{
}
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 :
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 :
CYPrecedence(0)
+ virtual CYExpression *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
CYExpression
{
CYPrecedence(0)
+ CYRightHand(false)
};
-struct CYMagic :
- CYExpression
+struct CYTrivial :
+ CYLiteral
{
- CYPrecedence(0)
+ virtual CYExpression *Replace(CYContext &context);
};
-struct CYSelectorPart :
- CYNext<CYSelectorPart>
-{
- 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
+struct CYMagic :
+ CYExpression
{
- CYSelectorPart *name_;
-
- CYSelector(CYSelectorPart *name) :
- name_(name)
- {
- }
-
- CYPrecedence(1)
-
- virtual void Output(CYOutput &out, CYFlags flags) const;
+ CYPrecedence(0)
+ CYRightHand(false)
};
struct CYRange {
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_))
{
}
return value_;
}
- 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 const char *Word() const;
- virtual void Output(CYOutput &out) const {
- return Output(out, CYNoFlags);
- }
+ 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_;
return value_;
}
- virtual void Output(CYOutput &out) const {
- return Output(out, CYNoFlags);
- }
+ 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_;
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;
};
{
}
+ 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;
{
}
- virtual bool Value() const;
+ virtual bool Value() const {
+ return false;
+ }
+
+ virtual CYNumber *Number(CYContext &context);
+ virtual CYString *String(CYContext &context);
};
struct CYTrue :
{
}
- virtual bool Value() const;
+ virtual bool Value() const {
+ return true;
+ }
+
+ virtual CYNumber *Number(CYContext &context);
+ virtual CYString *String(CYContext &context);
};
struct CYVariable :
{
}
+ CYVariable(const char *name) :
+ name_(new($pool) CYIdentifier(name))
+ {
+ }
+
CYPrecedence(0)
+ CYRightHand(false)
+ virtual CYExpression *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
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;
};
virtual bool Alphabetic() const = 0;
virtual const char *Operator() const = 0;
+ virtual CYExpression *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
virtual const char *Operator() const = 0;
+ CYPrecedence(3)
+
+ virtual CYExpression *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
virtual const char *Operator() const = 0;
+ CYPrecedence(16)
+
+ virtual CYExpression *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYArgument :
- CYNext<CYArgument>
+ CYNext<CYArgument>,
+ CYThing
{
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),
{
}
+ CYArgument *Replace(CYContext &context);
void Output(CYOutput &out) const;
};
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;
};
struct CYElement :
- CYNext<CYElement>
+ CYNext<CYElement>,
+ CYThing
{
CYExpression *value_;
{
}
+ void Replace(CYContext &context);
void Output(CYOutput &out) const;
};
{
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)
{
}
virtual void ForIn(CYOutput &out, CYFlags flags) const;
+ virtual CYStatement *ForEachIn(CYContext &out, CYExpression *value);
+
+ virtual CYExpression *Replace(CYContext &context);
- virtual const char *ForEachIn() const;
- virtual void ForEachIn(CYOutput &out) const;
+ virtual CYAssignment *Assignment(CYContext &context);
+ CYVariable *Variable(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYDeclarations :
CYNext<CYDeclarations>,
- CYForInitialiser
+ CYThing
{
CYDeclaration *declaration_;
- CYDeclarations(CYDeclaration *declaration, CYDeclarations *next) :
+ CYDeclarations(CYDeclaration *declaration, CYDeclarations *next = NULL) :
CYNext<CYDeclarations>(next),
declaration_(declaration)
{
}
- virtual void For(CYOutput &out) const;
- virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
-struct CYVar :
- CYStatement
-{
- CYDeclarations *declarations_;
+ void Replace(CYContext &context);
- CYVar(CYDeclarations *declarations) :
- declarations_(declarations)
- {
- }
+ CYCompound *Compound(CYContext &context);
+ CYProperty *Property(CYContext &context);
+ CYArgument *Argument(CYContext &context);
+ CYFunctionParameter *Parameter(CYContext &context);
virtual void Output(CYOutput &out) const;
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
-struct CYLet :
- CYStatement
+struct CYForDeclarations :
+ CYForInitialiser
{
CYDeclarations *declarations_;
- CYStatement *statements_;
-
- CYLet(CYDeclarations *declarations, CYStatement *statements) :
- declarations_(declarations),
- statements_(statements)
- {
- }
-
- virtual void Output(CYOutput &out) 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_;
- CYSource *body_;
- CYMessage(bool instance, CYExpression *type, CYMessageParameter *parameter, CYSource *body) :
- instance_(instance),
- type_(type),
- parameter_(parameter),
- body_(body)
+ CYForDeclarations(CYDeclarations *declarations) :
+ declarations_(declarations)
{
}
- virtual void Output(CYOutput &out, bool replace) const;
+ virtual CYCompound *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
-struct CYClass :
- CYExpression,
+struct CYVar :
CYStatement
{
- CYClassName *name_;
- CYExpression *super_;
- CYField *fields_;
- CYMessage *messages_;
+ CYDeclarations *declarations_;
- CYClass(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
- name_(name),
- super_(super),
- fields_(fields),
- messages_(messages)
+ CYVar(CYDeclarations *declarations) :
+ declarations_(declarations)
{
}
- CYPrecedence(0)
-
- virtual void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
-struct CYCategory :
+struct CYLetStatement :
CYStatement
{
- CYClassName *name_;
- CYMessage *messages_;
-
- CYCategory(CYClassName *name, CYMessage *messages) :
- name_(name),
- messages_(messages)
- {
- }
-
- virtual void Output(CYOutput &out) const;
-};
-
-struct CYFunctionParameter :
- CYNext<CYFunctionParameter>,
- CYThing
-{
- CYIdentifier *name_;
+ CYDeclarations *declarations_;
+ CYStatement *code_;
- CYFunctionParameter(CYIdentifier *name, CYFunctionParameter *next) :
- CYNext<CYFunctionParameter>(next),
- name_(name)
+ CYLetStatement(CYDeclarations *declarations, CYStatement *code) :
+ declarations_(declarations),
+ code_(code)
{
}
- virtual void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYFor :
{
}
- virtual void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYForIn :
{
}
- virtual void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
-struct CYForEachIn :
+struct CYForOf :
CYStatement
{
CYForInInitialiser *initialiser_;
CYExpression *set_;
CYStatement *code_;
- CYForEachIn(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :
+ CYForOf(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :
initialiser_(initialiser),
set_(set),
code_(code)
{
}
- virtual void Output(CYOutput &out) const;
-};
-
-struct CYProperty :
- CYNext<CYProperty>
-{
- CYPropertyName *name_;
- CYExpression *value_;
-
- CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next) :
- CYNext<CYProperty>(next),
- name_(name),
- value_(value)
- {
- }
-
- virtual void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYObject :
CYLiteral
{
- CYProperty *property_;
+ CYProperty *properties_;
- CYObject(CYProperty *property) :
- property_(property)
+ CYObject(CYProperty *properties = NULL) :
+ 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
{
}
CYPrecedence(1)
+ CYRightHand(false)
+ virtual CYExpression *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
}
CYPrecedence(1)
+ CYRightHand(false)
+ virtual CYExpression *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
-struct CYNew :
+namespace cy {
+namespace Syntax {
+
+struct New :
CYExpression
{
CYExpression *constructor_;
CYArgument *arguments_;
- CYNew(CYExpression *constructor, CYArgument *arguments) :
+ New(CYExpression *constructor, CYArgument *arguments) :
constructor_(constructor),
arguments_(arguments)
{
}
- CYPrecedence(1)
+ virtual unsigned Precedence() const {
+ return arguments_ == NULL ? 2 : 1;
+ }
+ CYRightHand(false)
+
+ virtual CYExpression *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
+
+ virtual CYExpression *AddArgument(CYContext &context, CYExpression *value);
};
+} }
+
struct CYCall :
CYExpression
{
CYExpression *function_;
CYArgument *arguments_;
- CYCall(CYExpression *function, CYArgument *arguments) :
+ CYCall(CYExpression *function, CYArgument *arguments = NULL) :
function_(function),
arguments_(arguments)
{
}
- CYPrecedence(2)
+ CYPrecedence(1)
+ CYRightHand(false)
+
+ virtual CYExpression *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
+
+ virtual CYExpression *AddArgument(CYContext &context, CYExpression *value);
+};
+
+struct CYRubyProc;
+
+struct CYRubyBlock :
+ CYExpression
+{
+ CYExpression *call_;
+ CYRubyProc *proc_;
+
+ CYRubyBlock(CYExpression *call, CYRubyProc *proc) :
+ call_(call),
+ proc_(proc)
+ {
+ }
+
+ CYPrecedence(1)
+ CYRightHand(false)
+ virtual CYExpression *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
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 void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYDoWhile :
{
}
- virtual void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYWhile :
{
}
- virtual void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
-struct CYLambda :
- CYExpression
-{
+// XXX: this should be split up into CYAnonymousFunction and CYNamedFunction (subclass)
+struct CYFunction {
CYIdentifier *name_;
CYFunctionParameter *parameters_;
- CYSource *body_;
+ CYBlock code_;
+
+ CYNonLocal *nonlocal_;
+ CYThisScope this_;
- CYLambda(CYIdentifier *name, CYFunctionParameter *parameters, CYSource *body) :
+ CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
name_(name),
parameters_(parameters),
- body_(body)
+ code_(statements),
+ nonlocal_(NULL)
+ {
+ }
+
+ virtual ~CYFunction() {
+ }
+
+ void Inject(CYContext &context);
+ virtual void Replace_(CYContext &context, bool outer);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+// XXX: this should be split up into CYAnonymousFunctionExpression and CYNamedFunctionExpression
+struct CYFunctionExpression :
+ CYFunction,
+ CYExpression
+{
+ 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;
};
-struct CYFunction :
- CYLambda,
- CYSource
+// XXX: this should derive from CYAnonymousFunction
+struct CYFatArrow :
+ CYFunction,
+ CYExpression
{
- CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYSource *body) :
- CYLambda(name, parameters, body)
+ CYFatArrow(CYFunctionParameter *parameters, CYStatement *statements) :
+ CYFunction(NULL, parameters, statements)
{
}
- virtual void Output(CYOutput &out) const;
+ CYPrecedence(0)
+ CYRightHand(false)
+
+ virtual CYExpression *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+// XXX: this should derive from CYAnonymousFunctionExpression
+struct CYRubyProc :
+ CYFunctionExpression
+{
+ CYRubyProc(CYFunctionParameter *parameters, CYStatement *statements) :
+ CYFunctionExpression(NULL, parameters, statements)
+ {
+ }
+
+ virtual CYExpression *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+// XXX: this should derive from CYNamedFunction
+struct CYFunctionStatement :
+ CYFunction,
+ CYStatement
+{
+ CYFunctionStatement(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
+ CYFunction(name, parameters, statements)
+ {
+ }
+
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYExpress :
CYExpress(CYExpression *expression) :
expression_(expression)
{
+ if (expression == NULL)
+ throw;
}
- virtual void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYContinue :
{
}
- virtual void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYBreak :
{
}
- virtual void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYReturn :
{
}
- virtual void Output(CYOutput &out) const;
+ 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 :
+ CYThing
+{
+ CYBlock 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;
- virtual void Output(CYOutput &out, bool block) const;
};
-struct CYTry :
+struct Try :
CYStatement
{
- CYStatement *try_;
- CYCatch *catch_;
- CYStatement *finally_;
+ CYBlock code_;
+ Catch *catch_;
+ CYFinally *finally_;
- CYTry(CYStatement *_try, CYCatch *_catch, CYStatement *finally) :
- try_(_try),
+ Try(CYStatement *statements, Catch *_catch, CYFinally *finally) :
+ code_(statements),
catch_(_catch),
finally_(finally)
{
}
- virtual void Output(CYOutput &out) const;
+ 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 = NULL) :
value_(value)
{
}
- virtual void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
+} }
+
struct CYWith :
CYStatement
{
{
}
- virtual void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYSwitch :
{
}
- virtual void Output(CYOutput &out) const;
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYDebugger :
+ CYStatement
+{
+ CYDebugger()
+ {
+ }
+
+ virtual CYStatement *Replace(CYContext &context);
+ virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYCondition :
CYPrecedence(15)
+ virtual CYExpression *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
}
CYAlphabetic(false)
- CYPrecedence(2)
- virtual void Output(CYOutput &out, CYFlags flags) const;
+ virtual CYExpression *Replace(CYContext &context);
};
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) \
{ \
} \
};
-#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; \
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, "+", Add, CYReplace)
CYInfix_(false, 6, "-", Subtract)
CYInfix_(false, 7, "<<", ShiftLeft)
CYInfix_(false, 7, ">>", ShiftRightSigned)
CYAssignment_("^=", BitwiseXOr)
CYAssignment_("|=", BitwiseOr)
-#endif/*CYPARSER_HPP*/
+#endif/*CYCRIPT_PARSER_HPP*/
projects / cycript.git / blobdiff