From fd5cdf97150f0c0f2126d61f6e91511cc6b22936 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Thu, 23 Jan 2014 13:55:47 -0800 Subject: [PATCH] De-CYNext CYExpression, fix CYCompound/Primitive. --- Console.cpp | 14 +++++++------ Cycript.yy.in | 4 ++-- Output.cpp | 20 +++++++----------- Parser.hpp | 25 ++++++++++++---------- Replace.cpp | 58 +++++++++++++++++++++++++-------------------------- 5 files changed, 60 insertions(+), 61 deletions(-) diff --git a/Console.cpp b/Console.cpp index 7205529..9d3d65a 100644 --- a/Console.cpp +++ b/Console.cpp @@ -227,11 +227,14 @@ static CYExpression *ParseExpression(CYUTF8String code) { CYOptions options; CYContext context(options); - // XXX: this could be replaced with a CYStatement::Primitive() - if (CYExpress *express = dynamic_cast(driver.program_->statements_)) - return express->expression_->Primitive(context); + CYStatement *statement(driver.program_->statements_); + _assert(statement != NULL); + _assert(statement->next_ == NULL); - return NULL; + CYExpress *express(dynamic_cast(driver.program_->statements_)); + _assert(express != NULL); + + return express->expression_; } static int client_; @@ -316,8 +319,7 @@ static char **Complete(const char *word, int start, int end) { if (result == NULL) return NULL; - CYArray *array(dynamic_cast(result)); - + CYArray *array(dynamic_cast(result->Primitive(context))); if (array == NULL) { *out_ << '\n'; Output(false, json, out_); diff --git a/Cycript.yy.in b/Cycript.yy.in index 2227201..3a31f1e 100644 --- a/Cycript.yy.in +++ b/Cycript.yy.in @@ -1054,11 +1054,11 @@ AssignmentExpression /* 11.14 Comma Operator {{{ */ Expression_ : "," Expression { $$ = $2; } - | { $$ = CYNew CYCompound(); } + | { $$ = NULL; } ; Expression - : AssignmentExpression Expression_ { $2->AddPrev($1); $$ = $2; } + : AssignmentExpression Expression_ { $$ = CYNew CYCompound($1, $2); } ; ExpressionOpt diff --git a/Output.cpp b/Output.cpp index 9b9bc72..6022514 100644 --- a/Output.cpp +++ b/Output.cpp @@ -194,19 +194,13 @@ void CYComment::Output(CYOutput &out, CYFlags flags) const { } void CYCompound::Output(CYOutput &out, CYFlags flags) const { - if (CYExpression *expression = expressions_) - if (CYExpression *next = expression->next_) { - expression->Output(out, CYLeft(flags)); - CYFlags center(CYCenter(flags)); - while (next != NULL) { - expression = next; - out << ',' << ' '; - next = expression->next_; - CYFlags right(next != NULL ? center : CYRight(flags)); - expression->Output(out, right); - } - } else - expression->Output(out, flags); + if (next_ == NULL) + expression_->Output(out, flags); + else { + expression_->Output(out, CYLeft(flags)); + out << ',' << ' '; + next_->Output(out, CYRight(flags)); + } } void CYCondition::Output(CYOutput &out, CYFlags flags) const { diff --git a/Parser.hpp b/Parser.hpp index fa0bc09..e804e4a 100644 --- a/Parser.hpp +++ b/Parser.hpp @@ -506,7 +506,6 @@ struct CYNumber; struct CYString; struct CYExpression : - CYNext, CYForInitialiser, CYForInInitialiser, CYClassName, @@ -534,7 +533,7 @@ struct CYExpression : virtual CYAssignment *Assignment(CYContext &context); virtual CYExpression *Primitive(CYContext &context) { - return this; + return NULL; } virtual CYNumber *Number(CYContext &context) { @@ -569,16 +568,16 @@ struct CYExpression : struct CYCompound : CYExpression { - CYExpression *expressions_; + CYExpression *expression_; + CYExpression *next_; - CYCompound(CYExpression *expressions = NULL) : - expressions_(expressions) + CYCompound(CYExpression *expression, CYExpression *next = NULL) : + expression_(expression), + next_(next) { - } - - void AddPrev(CYExpression *expression) { - CYSetLast(expression) = expressions_; - expressions_ = expression; + if (expression_ == NULL) + throw; + _assert(expression_ != NULL); } CYPrecedence(17) @@ -716,6 +715,10 @@ struct CYLiteral : { CYPrecedence(0) CYRightHand(false) + + virtual CYExpression *Primitive(CYContext &context) { + return this; + } }; struct CYTrivial : @@ -1535,7 +1538,7 @@ struct CYExpress : CYExpress(CYExpression *expression) : expression_(expression) { - if (expression == NULL) + if (expression_ == NULL) throw; } diff --git a/Replace.cpp b/Replace.cpp index f914af9..b658cf7 100644 --- a/Replace.cpp +++ b/Replace.cpp @@ -32,19 +32,16 @@ CYFunctionExpression *CYNonLocalize(CYContext &context, CYFunctionExpression *fu CYExpression *CYAdd::Replace(CYContext &context) { CYInfix::Replace(context); - CYExpression *lhp(lhs_->Primitive(context)); - CYExpression *rhp(rhs_->Primitive(context)); - - CYString *lhs(dynamic_cast(lhp)); - CYString *rhs(dynamic_cast(rhp)); + CYString *lhs(dynamic_cast(lhs_)); + CYString *rhs(dynamic_cast(rhs_)); if (lhs != NULL || rhs != NULL) { if (lhs == NULL) { - lhs = lhp->String(context); + lhs = lhs_->String(context); if (lhs == NULL) return this; } else if (rhs == NULL) { - rhs = rhp->String(context); + rhs = rhs_->String(context); if (rhs == NULL) return this; } @@ -52,8 +49,8 @@ CYExpression *CYAdd::Replace(CYContext &context) { return lhs->Concat(context, rhs); } - if (CYNumber *lhn = lhp->Number(context)) - if (CYNumber *rhn = rhp->Number(context)) + if (CYNumber *lhn = lhs_->Number(context)) + if (CYNumber *rhn = rhs_->Number(context)) return $D(lhn->Value() + rhn->Value()); return this; @@ -149,18 +146,26 @@ CYStatement *CYComment::Replace(CYContext &context) { } CYExpression *CYCompound::Replace(CYContext &context) { - context.ReplaceAll(expressions_); - if (expressions_ == NULL) - return NULL; + if (next_ == NULL) + return expression_; + + context.Replace(expression_); + context.Replace(next_); + + if (CYCompound *compound = dynamic_cast(expression_)) { + expression_ = compound->expression_; + compound->expression_ = compound->next_; + compound->next_ = next_; + next_ = compound; + } + return this; } CYExpression *CYCompound::Primitive(CYContext &context) { - CYExpression *expression(expressions_); - if (expression == NULL) + CYExpression *expression(expression_); + if (expression == NULL || next_ != NULL) return NULL; - while (expression->next_ != NULL) - expression = expression->next_; return expression->Primitive(context); } @@ -262,9 +267,9 @@ CYArgument *CYDeclarations::Argument(CYContext &context) { $T(NULL) } CYCompound *CYDeclarations::Compound(CYContext &context) { $T(NULL) - CYCompound *compound(next_->Compound(context) ?: $ CYCompound()); + CYCompound *compound(next_->Compound(context)); if (CYAssignment *assignment = declaration_->Assignment(context)) - compound->AddPrev(assignment); + compound = $ CYCompound(assignment, compound); return compound; } @@ -295,11 +300,7 @@ CYExpression *CYEncodedType::Replace(CYContext &context) { CYStatement *CYExpress::Replace(CYContext &context) { while (CYExpress *express = dynamic_cast(next_)) { - CYCompound *compound(dynamic_cast(express->expression_)); - if (compound == NULL) - compound = $ CYCompound(express->expression_); - compound->AddPrev(expression_); - expression_ = compound; + expression_ = $ CYCompound(expression_, express->expression_); SetNext(express->next_); } @@ -536,11 +537,8 @@ CYStatement *CYLetStatement::Replace(CYContext &context) { CYExpression *CYMultiply::Replace(CYContext &context) { CYInfix::Replace(context); - CYExpression *lhp(lhs_->Primitive(context)); - CYExpression *rhp(rhs_->Primitive(context)); - - if (CYNumber *lhn = lhp->Number(context)) - if (CYNumber *rhn = rhp->Number(context)) + if (CYNumber *lhn = lhs_->Number(context)) + if (CYNumber *rhn = rhs_->Number(context)) return $D(lhn->Value() * rhn->Value()); return this; @@ -961,7 +959,9 @@ CYExpression *CYTypedParameter::TypeSignature(CYContext &context, CYExpression * CYStatement *CYVar::Replace(CYContext &context) { declarations_->Replace(context); - return $E(declarations_->Compound(context)); + if (CYCompound *compound = declarations_->Compound(context)) + return $E(compound); + return $ CYEmpty(); } CYExpression *CYVariable::Replace(CYContext &context) { -- 2.45.2