/* }}} */
#include "Parser.hpp"
+#include "Context.hpp"
#include <iomanip>
if (lhs == NULL) {
lhs = lhp->String(context);
if (lhs == NULL)
- return NULL;
+ return this;
} else if (rhs == NULL) {
rhs = rhp->String(context);
if (rhs == NULL)
- return NULL;
+ return this;
}
return lhs->Concat(context, rhs);
if (CYNumber *rhn = rhp->Number(context))
return $D(lhn->Value() + rhn->Value());
- return NULL;
+ return this;
}
CYExpression *CYAddressOf::Replace(CYContext &context) {
CYExpression *CYArray::Replace(CYContext &context) {
elements_->Replace(context);
- return NULL;
+ return this;
}
CYExpression *CYArrayComprehension::Replace(CYContext &context) {
CYExpression *CYAssignment::Replace(CYContext &context) {
context.Replace(lhs_);
context.Replace(rhs_);
- return NULL;
+ return this;
}
CYStatement *CYBlock::Replace(CYContext &context) {
statements_ = statements_->ReplaceAll(context);
- return NULL;
+ if (statements_ == NULL)
+ return $ CYEmpty();
+ return this;
}
CYStatement *CYBreak::Replace(CYContext &context) {
- return NULL;
+ return this;
}
CYExpression *CYCall::Replace(CYContext &context) {
context.Replace(function_);
arguments_->Replace(context);
- return NULL;
+ return this;
}
namespace cy {
next_->Replace(context);
}
+CYStatement *CYComment::Replace(CYContext &context) {
+ return this;
+}
+
CYExpression *CYCompound::Replace(CYContext &context) {
expressions_ = expressions_->ReplaceAll(context);
- return NULL;
+ return expressions_ == NULL ? NULL : this;
}
CYFunctionParameter *CYComprehension::Parameters(CYContext &context) const { $T(NULL)
context.Replace(test_);
context.Replace(true_);
context.Replace(false_);
- return NULL;
+ return this;
}
CYStatement *CYContinue::Replace(CYContext &context) {
- return NULL;
+ return this;
+}
+
+CYAssignment *CYDeclaration::Assignment(CYContext &context) {
+ CYExpression *variable(Replace(context));
+ return initialiser_ == NULL ? NULL : $ CYAssign(variable, initialiser_);
}
CYExpression *CYDeclaration::ForEachIn(CYContext &context) {
return $ CYVariable(identifier_);
}
-void CYDeclaration::Replace(CYContext &context) {
- context.Replace(initialiser_);
+CYExpression *CYDeclaration::Replace(CYContext &context) {
+ context.Replace(identifier_);
+ context.scope_->Declare(context, identifier_, CYIdentifierVariable);
+ return $ CYVariable(identifier_);
}
CYProperty *CYDeclarations::Property(CYContext &context) { $T(NULL)
return $ CYProperty(declaration_->identifier_, declaration_->initialiser_ ?: $U, next_->Property(context));
}
-void CYDeclarations::Replace(CYContext &context) { $T()
- declaration_->Replace(context);
- next_->Replace(context);
+CYCompound *CYDeclarations::Replace(CYContext &context) {
+ CYCompound *compound;
+ if (next_ == NULL) compound:
+ compound = $ CYCompound();
+ else {
+ compound = next_->Replace(context);
+ if (compound == NULL)
+ goto compound;
+ }
+
+ if (CYAssignment *assignment = declaration_->Assignment(context))
+ compound->AddPrev(assignment);
+ return compound;
}
CYExpression *CYDirectMember::Replace(CYContext &context) {
Replace_(context);
- return NULL;
+ return this;
}
CYStatement *CYDoWhile::Replace(CYContext &context) {
context.Replace(test_);
context.Replace(code_);
- return NULL;
+ return this;
}
void CYElement::Replace(CYContext &context) { $T()
next_->Replace(context);
}
+CYStatement *CYEmpty::Collapse(CYContext &context) {
+ return next_;
+}
+
CYStatement *CYEmpty::Replace(CYContext &context) {
- return NULL;
+ return this;
+}
+
+CYStatement *CYExpress::Collapse(CYContext &context) {
+ if (CYExpress *express = dynamic_cast<CYExpress *>(next_)) {
+ CYCompound *next(dynamic_cast<CYCompound *>(express->expression_));
+ if (next == NULL)
+ next = $ CYCompound(express->expression_);
+ next->AddPrev(expression_);
+ expression_ = next;
+ SetNext(express->next_);
+ }
+
+ return this;
}
CYStatement *CYExpress::Replace(CYContext &context) {
context.Replace(expression_);
- return NULL;
+ if (expression_ == NULL)
+ return $ CYEmpty();
+ return this;
}
CYExpression *CYExpression::ClassName(CYContext &context, bool object) {
}
CYStatement *CYFor::Replace(CYContext &context) {
- // XXX: initialiser_
+ context.Replace(initialiser_);
context.Replace(test_);
context.Replace(increment_);
context.Replace(code_);
- return NULL;
+ return this;
}
CYStatement *CYForIn::Replace(CYContext &context) {
- // XXX: initialiser_
+ // XXX: this actually might need a prefix statement
+ context.Replace(initialiser_);
context.Replace(set_);
context.Replace(code_);
- return NULL;
+ return this;
}
CYFunctionParameter *CYForInComprehension::Parameter(CYContext &context) const {
)));
}
-void CYFunction::Replace_(CYContext &context) {
+void CYFunction::Inject(CYContext &context) {
+ name_ = name_->Replace(context);
+ context.scope_->Declare(context, name_, CYIdentifierOther);
+}
+
+void CYFunction::Replace_(CYContext &context, bool outer) {
+ if (outer)
+ Inject(context);
+
+ parent_ = context.scope_;
+ context.scope_ = this;
+
+ if (!outer && name_ != NULL)
+ Inject(context);
+
+ parameters_->Replace(context);
code_.Replace(context);
+
+ context.scope_ = parent_;
+ Scope(context, code_.statements_);
}
CYExpression *CYFunctionExpression::Replace(CYContext &context) {
- Replace_(context);
- return NULL;
+ Replace_(context, false);
+ return this;
+}
+
+void CYFunctionParameter::Replace(CYContext &context) { $T()
+ name_ = name_->Replace(context);
+ context.scope_->Declare(context, name_, CYIdentifierArgument);
+ next_->Replace(context);
}
CYStatement *CYFunctionStatement::Replace(CYContext &context) {
- Replace_(context);
- return NULL;
+ Replace_(context, true);
+ return this;
+}
+
+CYIdentifier *CYIdentifier::Replace(CYContext &context) {
+ if (replace_ == NULL)
+ replace_ = context.scope_->Lookup(context, this);
+ return replace_;
}
CYStatement *CYIf::Replace(CYContext &context) {
context.Replace(test_);
context.Replace(true_);
context.Replace(false_);
- return NULL;
+ return this;
}
CYFunctionParameter *CYIfComprehension::Parameter(CYContext &context) const {
CYExpression *CYInfix::Replace(CYContext &context) {
context.Replace(lhs_);
context.Replace(rhs_);
- return NULL;
+ return this;
}
CYStatement *CYLabel::Replace(CYContext &context) {
context.Replace(statement_);
- return NULL;
+ return this;
}
CYStatement *CYLet::Replace(CYContext &context) {
CYExpression *CYNew::Replace(CYContext &context) {
context.Replace(constructor_);
arguments_->Replace(context);
- return NULL;
+ return this;
}
CYNumber *CYNull::Number(CYContext &context) {
CYExpression *CYObject::Replace(CYContext &context) {
properties_->Replace(context);
- return NULL;
+ return this;
}
CYExpression *CYPostfix::Replace(CYContext &context) {
context.Replace(lhs_);
- return NULL;
+ return this;
}
CYExpression *CYPrefix::Replace(CYContext &context) {
context.Replace(rhs_);
- return NULL;
+ return this;
}
void CYProgram::Replace(CYContext &context) {
+ parent_ = context.scope_;
+ CYProgram *program(context.program_);
+
+ context.scope_ = this;
+ context.program_ = this;
+
statements_ = statements_->ReplaceAll(context);
+
+ context.scope_ = parent_;
+ context.program_ = program;
+ Scope(context, statements_);
+
+ size_t offset(0);
+
+ // XXX: totalling the probable occurrences and sorting by them would improve the result
+ for (CYIdentifierAddressVector::const_iterator i(rename_.begin()); i != rename_.end(); ++i, ++offset) {
+ const char *name;
+
+ if (context.options_.verbose_)
+ name = apr_psprintf(context.pool_, "$%"APR_SIZE_T_FMT"", offset);
+ else {
+ char id[8];
+ id[7] = '\0';
+
+ id:
+ unsigned position(7), local(offset + 1);
+
+ do {
+ unsigned index(local % 53);
+ local /= 53;
+ id[--position] = index == 0 ? '0' : index < 27 ? index - 1 + 'a' : index - 27 + 'A';
+ } while (local != 0);
+
+ if (external_.find(id + position) != external_.end()) {
+ ++offset;
+ goto id;
+ }
+
+ name = apr_pstrmemdup(context.pool_, id + position, 7 - position);
+ // XXX: at some point, this could become a keyword
+ }
+
+ for (CYIdentifier *identifier(*i); identifier != NULL; identifier = identifier->next_)
+ identifier->Set(name);
+ }
}
void CYProperty::Replace(CYContext &context) { $T()
CYStatement *CYReturn::Replace(CYContext &context) {
context.Replace(value_);
- return NULL;
+ return this;
+}
+
+void CYScope::Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags) {
+ internal_.insert(CYIdentifierAddressFlagsMap::value_type(identifier, flags));
+}
+
+CYIdentifier *CYScope::Lookup(CYContext &context, CYIdentifier *identifier) {
+ std::pair<CYIdentifierValueSet::iterator, bool> insert(identifiers_.insert(identifier));
+ return *insert.first;
+}
+
+void CYScope::Merge(CYContext &context, CYIdentifierAddressVector &external) {
+ for (CYIdentifierAddressVector::const_iterator i(external.begin()); i != external.end(); ++i) {
+ std::pair<CYIdentifierAddressSet::iterator, bool> insert(identifiers_.insert(*i));
+ if (!insert.second)
+ (*i)->replace_ = *insert.first;
+ }
+}
+
+void CYScope::Scope(CYContext &context, CYStatement *&statements) {
+ CYIdentifierAddressVector external;
+
+ for (CYIdentifierValueSet::const_iterator i(identifiers_.begin()); i != identifiers_.end(); ++i)
+ if (internal_.find(*i) == internal_.end())
+ external.push_back(*i);
+
+ CYDeclarations *last(NULL), *curr(NULL);
+ CYProgram *program(context.program_);
+
+ // XXX: we don't want to do this in order, we want to sort it by probable occurrence
+ for (CYIdentifierAddressFlagsMap::const_iterator i(internal_.begin()); i != internal_.end(); ++i) {
+ if (program != NULL && i->second != CYIdentifierMagic) {
+ if (program->rename_.size() <= offset_)
+ program->rename_.resize(offset_ + 1);
+ CYIdentifier *&identifier(program->rename_[offset_++]);
+ i->first->SetNext(identifier);
+ identifier = i->first;
+ }
+
+ if (i->second == CYIdentifierVariable) {
+ CYDeclarations *next($ CYDeclarations($ CYDeclaration(i->first)));
+ if (last == NULL)
+ last = next;
+ if (curr != NULL)
+ curr->SetNext(next);
+ curr = next;
+ }
+ }
+
+ if (last != NULL) {
+ CYVar *var($ CYVar(last));
+ var->SetNext(statements);
+ statements = var;
+ }
+
+ if (parent_ != NULL) {
+ if (parent_->offset_ < offset_)
+ parent_->offset_ = offset_;
+ parent_->Merge(context, external);
+ } else if (program != NULL)
+ for (CYIdentifierAddressVector::const_iterator i(external.begin()); i != external.end(); ++i)
+ program->external_.insert((*i)->Word());
+}
+
+CYStatement *CYStatement::Collapse(CYContext &context) {
+ return this;
}
CYStatement *CYStatement::ReplaceAll(CYContext &context) { $T(NULL)
CYStatement *replace(this);
context.Replace(replace);
-
- if (CYStatement *next = next_->ReplaceAll(context))
- replace->SetNext(next);
- else
- replace->SetNext(next_);
-
- return replace;
+ replace->SetNext(next_->ReplaceAll(context));
+ return replace->Collapse(context);
}
CYString *CYString::Concat(CYContext &context, CYString *rhs) const {
CYStatement *CYSwitch::Replace(CYContext &context) {
context.Replace(value_);
clauses_->Replace(context);
- return NULL;
+ return this;
}
CYExpression *CYThis::Replace(CYContext &context) {
- return NULL;
+ return this;
}
namespace cy {
CYStatement *Throw::Replace(CYContext &context) {
context.Replace(value_);
- return NULL;
+ return this;
}
} }
CYExpression *CYTrivial::Replace(CYContext &context) {
- return NULL;
+ return this;
}
CYNumber *CYTrue::Number(CYContext &context) {
code_.Replace(context);
catch_->Replace(context);
finally_->Replace(context);
- return NULL;
+ return this;
}
} }
CYStatement *CYVar::Replace(CYContext &context) {
- declarations_->Replace(context);
- return NULL;
+ return $E(declarations_->Replace(context));
}
CYExpression *CYVariable::Replace(CYContext &context) {
- return NULL;
+ name_ = name_->Replace(context);
+ return this;
}
CYStatement *CYWhile::Replace(CYContext &context) {
context.Replace(test_);
context.Replace(code_);
- return NULL;
+ return this;
}
CYStatement *CYWith::Replace(CYContext &context) {
context.Replace(scope_);
context.Replace(code_);
- return NULL;
+ return this;
}
CYExpression *CYWord::ClassName(CYContext &context, bool object) {
projects / cycript.git / blobdiff