-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2015 Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016 Jay Freeman (saurik)
*/
/* GNU Affero General Public License, Version 3 {{{ */
/* }}} */
#include <iomanip>
+#include <map>
#include "Replace.hpp"
#include "Syntax.hpp"
return $C0($M(rhs_, $S("$cya")));
}
+CYTarget *CYApply::AddArgument(CYContext &context, CYExpression *value) {
+ CYArgument **argument(&arguments_);
+ while (*argument != NULL)
+ argument = &(*argument)->next_;
+ *argument = $ CYArgument(value);
+ return this;
+}
+
CYArgument *CYArgument::Replace(CYContext &context) { $T(NULL)
context.Replace(value_);
next_ = next_->Replace(context);
return this;
}
-CYExpression *CYArray::Replace(CYContext &context) {
- if (elements_ != NULL)
- elements_->Replace(context);
+CYTarget *CYArray::Replace(CYContext &context) {
+ CYForEach (element, elements_)
+ element->Replace(context);
return this;
}
-CYExpression *CYArrayComprehension::Replace(CYContext &context) {
- CYVariable *cyv($V("$cyv"));
+CYTarget *CYArrayComprehension::Replace(CYContext &context) {
+ CYIdentifier *cyv(context.Unique());
- return $C0($F(NULL, $P1($L($I("$cyv")), comprehensions_->Parameters(context)), $$->*
- $E($ CYAssign(cyv, $ CYArray()))->*
- comprehensions_->Replace(context, $E($C1($M(cyv, $S("push")), expression_)))->*
- $ CYReturn(cyv)
+ return $C0($F(NULL, $P1($B(cyv), comprehensions_->Parameters(context)), $$
+ ->* $E($ CYAssign($V(cyv), $ CYArray()))
+ ->* comprehensions_->Replace(context, $E($C1($M($V(cyv), $S("push")), expression_)))
+ ->* $ CYReturn($V(cyv))
));
}
CYExpression *CYAssignment::Replace(CYContext &context) {
+ // XXX: this is a horrible hack but I'm a month over schedule :(
+ if (CYSubscriptMember *subscript = dynamic_cast<CYSubscriptMember *>(lhs_))
+ return $C2($M(subscript->object_, $S("$cys")), subscript->property_, rhs_);
context.Replace(lhs_);
context.Replace(rhs_);
return this;
}
CYStatement *CYBlock::Replace(CYContext &context) {
+ CYScope scope(true, context);
context.ReplaceAll(code_);
+ scope.Close(context);
+
if (code_ == NULL)
return $ CYEmpty();
return this;
return this;
}
-CYExpression *CYCall::AddArgument(CYContext &context, CYExpression *value) {
- CYArgument **argument(&arguments_);
- while (*argument != NULL)
- argument = &(*argument)->next_;
- *argument = $ CYArgument(value);
- return this;
-}
-
-CYExpression *CYCall::Replace(CYContext &context) {
+CYTarget *CYCall::Replace(CYContext &context) {
context.Replace(function_);
arguments_->Replace(context);
return this;
void Catch::Replace(CYContext &context) { $T()
CYScope scope(true, context);
- context.Replace(name_);
- context.scope_->Declare(context, name_, CYIdentifierCatch);
+ name_ = name_->Replace(context, CYIdentifierCatch);
context.ReplaceAll(code_);
- scope.Close(context, code_);
+ scope.Close(context);
}
} }
-CYExpression *CYClassExpression::Replace(CYContext &context) {
+CYTarget *CYClassExpression::Replace(CYContext &context) {
CYBuilder builder;
CYIdentifier *super(context.Unique());
if (tail_->constructor_ == NULL)
tail_->constructor_ = $ CYFunctionExpression(NULL, NULL, NULL);
+ tail_->constructor_->name_ = name_;
tail_->constructor_ = CYSuperize(context, tail_->constructor_);
context.super_ = old;
- return $C1($ CYFunctionExpression(NULL, $P($L(super)), $$
- ->* $ CYVar($L1($L(constructor, tail_->constructor_)))
- ->* $ CYVar($L1($L(prototype, $ CYFunctionExpression(NULL, NULL, NULL))))
+ return $C1($ CYFunctionExpression(NULL, $P($B(super)), $$
+ ->* $ CYVar($B1($B(constructor, tail_->constructor_)))
+ ->* $ CYVar($B1($B(prototype, $ CYFunctionExpression(NULL, NULL, NULL))))
->* $E($ CYAssign($M($V(prototype), $S("prototype")), $M($V(super), $S("prototype"))))
->* $E($ CYAssign($V(prototype), $N($V(prototype))))
->* CYDefineProperty($V(prototype), $S("constructor"), false, false, $ CYPropertyValue($S("value"), $V(constructor)))
- ->* $ CYVar(builder.declarations_)
+ ->* $ CYVar(builder.bindings_)
->* builder.statements_
->* CYDefineProperty($V(constructor), $S("prototype"), false, false, $ CYPropertyValue($S("value"), $V(prototype)))
->* $ CYReturn($V(constructor))
}
CYStatement *CYClassStatement::Replace(CYContext &context) {
- return $ CYVar($L1($L(name_, $ CYClassExpression(name_, tail_))));
+ return $ CYVar($B1($B(name_, $ CYClassExpression(name_, tail_))));
}
void CYClause::Replace(CYContext &context) { $T()
- context.Replace(case_);
+ context.Replace(value_);
context.ReplaceAll(code_);
next_->Replace(context);
}
CYContext &context(*this);
if (nextlocal_ != NULL && nextlocal_->identifier_ != NULL) {
- CYIdentifier *cye($I("$cye")->Replace(context));
- CYIdentifier *unique(nextlocal_->identifier_->Replace(context));
+ CYIdentifier *cye($I("$cye")->Replace(context, CYIdentifierGlobal));
+ CYIdentifier *unique(nextlocal_->identifier_->Replace(context, CYIdentifierGlobal));
CYStatement *declare(
- $ CYVar($L1($L(unique, $ CYObject()))));
+ $ CYVar($B1($B(unique, $ CYObject()))));
cy::Syntax::Catch *rescue(
- $ cy::Syntax::Catch(cye, $$->*
- $ CYIf($ CYIdentical($M($V(cye), $S("$cyk")), $V(unique)), $$->*
- $ CYReturn($M($V(cye), $S("$cyv"))))->*
- $ cy::Syntax::Throw($V(cye))));
+ $ cy::Syntax::Catch(cye, $$
+ ->* $ CYIf($ CYIdentical($M($V(cye), $S("$cyk")), $V(unique)), $$
+ ->* $ CYReturn($M($V(cye), $S("$cyv"))))
+ ->* $ cy::Syntax::Throw($V(cye))));
- // XXX: I don't understand any of this
context.Replace(declare);
rescue->Replace(context);
- statements = $$->*
- declare->*
- $ cy::Syntax::Try(statements, rescue, NULL);
+ statements = $$
+ ->* declare
+ ->* $ cy::Syntax::Try(statements, rescue, NULL);
}
}
return this;
}
-CYAssignment *CYDeclaration::Assignment(CYContext &context) {
- if (initialiser_ == NULL)
- return NULL;
-
- CYAssignment *value($ CYAssign(Variable(context), initialiser_));
- initialiser_ = NULL;
- return value;
-}
-
-CYVariable *CYDeclaration::Variable(CYContext &context) {
+CYTarget *CYBinding::Target(CYContext &context) {
return $V(identifier_);
}
-CYStatement *CYDeclaration::ForEachIn(CYContext &context, CYExpression *value) {
- return $ CYVar($L1($ CYDeclaration(identifier_, value)));
-}
+CYAssignment *CYBinding::Replace(CYContext &context, CYIdentifierKind kind) {
+ identifier_ = identifier_->Replace(context, kind);
-CYExpression *CYDeclaration::Replace(CYContext &context) {
- context.Replace(identifier_);
- context.scope_->Declare(context, identifier_, CYIdentifierVariable);
- return Variable(context);
-}
-
-void CYDeclarations::Replace(CYContext &context) { $T()
- declaration_->Replace(context);
- next_->Replace(context);
-}
+ if (initializer_ == NULL)
+ return NULL;
-CYFunctionParameter *CYDeclarations::Parameter(CYContext &context) { $T(NULL)
- return $ CYFunctionParameter($ CYDeclaration(declaration_->identifier_), next_->Parameter(context));
+ CYAssignment *value($ CYAssign(Target(context), initializer_));
+ initializer_ = NULL;
+ return value;
}
-CYArgument *CYDeclarations::Argument(CYContext &context) { $T(NULL)
- return $ CYArgument(declaration_->initialiser_, next_->Argument(context));
-}
+CYExpression *CYBindings::Replace(CYContext &context, CYIdentifierKind kind) { $T(NULL)
+ CYAssignment *assignment(binding_->Replace(context, kind));
+ CYExpression *compound(next_->Replace(context, kind));
-CYExpression *CYDeclarations::Expression(CYContext &context) { $T(NULL)
- CYExpression *compound(next_->Expression(context));
- if (CYAssignment *assignment = declaration_->Assignment(context))
+ if (assignment != NULL)
if (compound == NULL)
compound = assignment;
else
return compound;
}
-CYExpression *CYDirectMember::Replace(CYContext &context) {
+CYFunctionParameter *CYBindings::Parameter(CYContext &context) { $T(NULL)
+ return $ CYFunctionParameter($ CYBinding(binding_->identifier_), next_->Parameter(context));
+}
+
+CYArgument *CYBindings::Argument(CYContext &context) { $T(NULL)
+ return $ CYArgument(binding_->initializer_, next_->Argument(context));
+}
+
+CYTarget *CYDirectMember::Replace(CYContext &context) {
context.Replace(object_);
context.Replace(property_);
return this;
void CYElementValue::Replace(CYContext &context) {
context.Replace(value_);
- if (next_ != NULL)
- next_->Replace(context);
}
-CYStatement *CYEmpty::Replace(CYContext &context) {
+CYForInitializer *CYEmpty::Replace(CYContext &context) {
return NULL;
}
-CYExpression *CYEncodedType::Replace(CYContext &context) {
+CYTarget *CYEncodedType::Replace(CYContext &context) {
return typed_->Replace(context);
}
+CYTarget *CYEval::Replace(CYContext &context) {
+ context.scope_->Damage();
+ if (arguments_ != NULL)
+ arguments_->value_ = $C1($M($V("Cycript"), $S("compile")), arguments_->value_);
+ return $C($V("eval"), arguments_);
+}
+
CYStatement *CYExpress::Return() {
return $ CYReturn(expression_);
}
-CYStatement *CYExpress::Replace(CYContext &context) {
+CYForInitializer *CYExpress::Replace(CYContext &context) {
context.Replace(expression_);
return this;
}
-CYExpression *CYExpression::AddArgument(CYContext &context, CYExpression *value) {
+CYTarget *CYExpression::AddArgument(CYContext &context, CYExpression *value) {
return $C1(this, value);
}
-CYStatement *CYExpression::ForEachIn(CYContext &context, CYExpression *value) {
- return $E($ CYAssign(this, value));
+CYFunctionParameter *CYExpression::Parameter() const {
+ return NULL;
}
-CYAssignment *CYExpression::Assignment(CYContext &context) {
- return NULL;
+CYTarget *CYExtend::Replace(CYContext &context) {
+ return object_.Replace(context, lhs_);
}
-CYFunctionParameter *CYExpression::Parameter() const {
- return NULL;
+CYStatement *CYExternalDefinition::Replace(CYContext &context) {
+ return $E($ CYAssign($V(name_), $ CYExternalExpression(abi_, type_, name_)));
}
-CYStatement *CYExternal::Replace(CYContext &context) {
- return $E($ CYAssign($V(typed_->identifier_), $C1(typed_->Replace(context), $C2($V("dlsym"), $V("RTLD_DEFAULT"), $S(typed_->identifier_->Word())))));
+CYTarget *CYExternalExpression::Replace(CYContext &context) {
+ return $C1(type_->Replace(context), $C2($V("dlsym"), $V("RTLD_DEFAULT"), name_->PropertyName(context)));
}
CYNumber *CYFalse::Number(CYContext &context) {
}
void CYFinally::Replace(CYContext &context) { $T()
+ CYScope scope(true, context);
context.ReplaceAll(code_);
+ scope.Close(context);
}
CYStatement *CYFor::Replace(CYContext &context) {
- context.Replace(initialiser_);
+ CYScope outer(true, context);
+ context.Replace(initializer_);
+
context.Replace(test_);
+
+ {
+ CYScope inner(true, context);
+ context.ReplaceAll(code_);
+ inner.Close(context);
+ }
+
context.Replace(increment_);
- context.ReplaceAll(code_);
+
+ outer.Close(context);
return this;
}
-CYExpression *CYForDeclarations::Replace(CYContext &context) {
- declarations_->Replace(context);
- return declarations_->Expression(context);
+CYStatement *CYForLexical::Initialize(CYContext &context, CYExpression *value) {
+ if (value == NULL) {
+ if (binding_->initializer_ == NULL)
+ return NULL;
+ value = binding_->initializer_;
+ }
+
+ return $ CYLexical(constant_, $B1($ CYBinding(binding_->identifier_, value)));
+}
+
+CYTarget *CYForLexical::Replace(CYContext &context) {
+ _assert(binding_->Replace(context, CYIdentifierLexical) == NULL);
+ return binding_->Target(context);
}
-// XXX: this still feels highly suboptimal
CYStatement *CYForIn::Replace(CYContext &context) {
- if (CYAssignment *assignment = initialiser_->Assignment(context))
- return $ CYBlock($$->*
- $E(assignment)->*
- this
- );
-
- context.Replace(initialiser_);
- context.Replace(set_);
+ CYScope scope(true, context);
+ context.Replace(initializer_);
+ context.Replace(iterable_);
context.ReplaceAll(code_);
+ scope.Close(context);
return this;
}
+CYStatement *CYForInitialized::Replace(CYContext &context) {
+ CYAssignment *assignment(binding_->Replace(context, CYIdentifierVariable));
+ return $ CYBlock($$
+ ->* (assignment == NULL ? NULL : $ CYExpress(assignment))
+ ->* $ CYForIn(binding_->Target(context), iterable_, code_));
+}
+
CYFunctionParameter *CYForInComprehension::Parameter(CYContext &context) const {
- return $ CYFunctionParameter(declaration_);
+ return $ CYFunctionParameter(binding_);
}
CYStatement *CYForInComprehension::Replace(CYContext &context, CYStatement *statement) const {
- return $ CYForIn(declaration_->Variable(context), set_, CYComprehension::Replace(context, statement));
+ return $ CYForIn(binding_->Target(context), iterable_, CYComprehension::Replace(context, statement));
}
CYStatement *CYForOf::Replace(CYContext &context) {
- if (CYAssignment *assignment = initialiser_->Assignment(context))
- return $ CYBlock($$->*
- $E(assignment)->*
- this
- );
-
- CYIdentifier *cys($I("$cys")), *cyt($I("$cyt"));
-
- return $ CYLetStatement($L2($ CYDeclaration(cys, set_), $ CYDeclaration(cyt)), $$->*
- $ CYForIn($V(cyt), $V(cys), $ CYBlock($$->*
- initialiser_->ForEachIn(context, $M($V(cys), $V(cyt)))->*
- code_
- ))
- );
+ CYIdentifier *item(context.Unique()), *list(context.Unique());
+
+ return $ CYBlock($$
+ ->* initializer_->Initialize(context, NULL)
+ ->* $ CYLexical(false, $B2($B(list, iterable_), $B(item)))
+ ->* $ CYForIn($V(item), $V(list), $ CYBlock($$
+ ->* initializer_->Initialize(context, $M($V(list), $V(item)))
+ ->* code_
+ )));
}
CYFunctionParameter *CYForOfComprehension::Parameter(CYContext &context) const {
- return $ CYFunctionParameter(declaration_);
+ return $ CYFunctionParameter(binding_);
}
CYStatement *CYForOfComprehension::Replace(CYContext &context, CYStatement *statement) const {
- CYIdentifier *cys($I("$cys"));
-
- return $E($C0($F(NULL, $P1($L($I("$cys"))), $$->*
- $E($ CYAssign($V(cys), set_))->*
- $ CYForIn(declaration_->Variable(context), $V(cys), $ CYBlock($$->*
- $E($ CYAssign(declaration_->Variable(context), $M($V(cys), declaration_->Variable(context))))->*
- CYComprehension::Replace(context, statement)
- ))
+ CYIdentifier *cys(context.Unique());
+
+ return $ CYBlock($$
+ ->* $ CYLexical(false, $B1($B(cys, iterable_)))
+ ->* $ CYForIn(binding_->Target(context), $V(cys), $ CYBlock($$
+ ->* $E($ CYAssign(binding_->Target(context), $M($V(cys), binding_->Target(context))))
+ ->* CYComprehension::Replace(context, statement)
)));
}
+CYStatement *CYForVariable::Initialize(CYContext &context, CYExpression *value) {
+ if (value == NULL) {
+ if (binding_->initializer_ == NULL)
+ return NULL;
+ value = binding_->initializer_;
+ }
+
+ return $ CYVar($B1($ CYBinding(binding_->identifier_, value)));
+}
+
+CYTarget *CYForVariable::Replace(CYContext &context) {
+ _assert(binding_->Replace(context, CYIdentifierVariable) == NULL);
+ return binding_->Target(context);
+}
+
+// XXX: this is evil evil black magic. don't ask, don't tell... don't believe!
+#define MappingSet "0etnirsoalfucdphmgyvbxTwSNECAFjDLkMOIBPqzRH$_WXUVGYKQJZ"
+//#define MappingSet "0abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_"
+
void CYFunction::Replace(CYContext &context) {
CYThisScope *_this(context.this_);
context.this_ = &this_;
CYScope scope(!localize, context);
+ $I("arguments")->Replace(context, CYIdentifierMagic);
+
parameters_->Replace(context, code_);
context.ReplaceAll(code_);
if (CYIdentifier *identifier = this_.identifier_) {
context.scope_->Declare(context, identifier, CYIdentifierVariable);
code_ = $$
- ->*$E($ CYAssign($V(identifier), $ CYThis()))
- ->*code_
- ;
+ ->* $E($ CYAssign($V(identifier), $ CYThis()))
+ ->* code_;
}
if (localize)
scope.Close(context, code_);
}
-CYExpression *CYFunctionExpression::Replace(CYContext &context) {
+CYTarget *CYFunctionExpression::Replace(CYContext &context) {
CYScope scope(false, context);
if (name_ != NULL)
- context.scope_->Declare(context, name_, CYIdentifierOther);
+ name_ = name_->Replace(context, CYIdentifierOther);
+
CYFunction::Replace(context);
- scope.Close(context, code_);
+ scope.Close(context);
return this;
}
void CYFunctionParameter::Replace(CYContext &context, CYStatement *&statements) { $T()
- CYAssignment *assignment(initialiser_->Assignment(context));
- context.Replace(initialiser_);
+ CYAssignment *assignment(binding_->Replace(context, CYIdentifierArgument));
next_->Replace(context, statements);
if (assignment != NULL)
- statements = $$->*
- // XXX: this cast is quite incorrect
- $ CYIf($ CYIdentical($ CYTypeOf(dynamic_cast<CYExpression *>(initialiser_)), $S("undefined")), $$->*
- $E(assignment)
- )->*
- statements;
+ statements = $$
+ ->* $ CYIf($ CYIdentical($ CYTypeOf(binding_->Target(context)), $S("undefined")), $$
+ ->* $E(assignment))
+ ->* statements;
}
CYStatement *CYFunctionStatement::Replace(CYContext &context) {
- context.scope_->Declare(context, name_, CYIdentifierOther);
+ name_ = name_->Replace(context, CYIdentifierOther);
CYFunction::Replace(context);
return this;
}
-CYIdentifier *CYIdentifier::Replace(CYContext &context) {
- if (replace_ != NULL && replace_ != this)
- return replace_->Replace(context);
- replace_ = context.scope_->Lookup(context, this);
- return replace_;
+CYIdentifier *CYIdentifier::Replace(CYContext &context, CYIdentifierKind kind) {
+ if (next_ == this)
+ return this;
+ if (next_ != NULL)
+ return next_->Replace(context, kind);
+ next_ = context.scope_->Declare(context, this, kind)->identifier_;
+ return next_;
}
CYStatement *CYIf::Return() {
}
CYStatement *CYImport::Replace(CYContext &context) {
- return $ CYVar($L1($L($I(module_->part_->Word()), $C1($V("require"), module_->Replace(context, "/")))));
+ return $ CYVar($B1($B($I(module_->part_->Word()), $C1($V("require"), module_->Replace(context, "/")))));
+}
+
+CYStatement *CYImportDeclaration::Replace(CYContext &context) {
+ CYIdentifier *module(context.Unique());
+
+ CYList<CYStatement> statements;
+ CYForEach (specifier, specifiers_)
+ statements->*specifier->Replace(context, module);
+
+ return $ CYBlock($$
+ ->* $ CYLexical(false, $B1($B(module, $C1($V("require"), module_))))
+ ->* statements);
+}
+
+CYStatement *CYImportSpecifier::Replace(CYContext &context, CYIdentifier *module) {
+ binding_ = binding_->Replace(context, CYIdentifierLexical);
+
+ CYExpression *import($V(module));
+ if (name_ != NULL)
+ import = $M(import, $S(name_));
+ return $E($ CYAssign($V(binding_), import));
}
-CYExpression *CYIndirect::Replace(CYContext &context) {
+CYTarget *CYIndirect::Replace(CYContext &context) {
return $M(rhs_, $S("$cyi"));
}
-CYExpression *CYIndirectMember::Replace(CYContext &context) {
+CYTarget *CYIndirectMember::Replace(CYContext &context) {
return $M($ CYIndirect(object_), property_);
}
return this;
}
-CYExpression *CYLambda::Replace(CYContext &context) {
+CYTarget *CYLambda::Replace(CYContext &context) {
return $N2($V("Functor"), $ CYFunctionExpression(NULL, parameters_->Parameters(context), code_), parameters_->TypeSignature(context, typed_->Replace(context)));
}
-CYStatement *CYLetStatement::Replace(CYContext &context) {
- return $E($ CYCall(CYNonLocalize(context, $ CYFunctionExpression(NULL, declarations_->Parameter(context), code_)), declarations_->Argument(context)));
+CYForInitializer *CYLexical::Replace(CYContext &context) {
+ if (CYExpression *expression = bindings_->Replace(context, CYIdentifierLexical))
+ return $E(expression);
+ return $ CYEmpty();
}
CYFunctionExpression *CYMethod::Constructor() {
namespace cy {
namespace Syntax {
-CYExpression *New::AddArgument(CYContext &context, CYExpression *value) {
+CYTarget *New::AddArgument(CYContext &context, CYExpression *value) {
CYSetLast(arguments_) = $ CYArgument(value);
return this;
}
-CYExpression *New::Replace(CYContext &context) {
+CYTarget *New::Replace(CYContext &context) {
context.Replace(constructor_);
arguments_->Replace(context);
return this;
return String(context);
}
-CYExpression *CYObject::Replace(CYContext &context) {
+CYTarget *CYObject::Replace(CYContext &context, CYTarget *seed) {
CYBuilder builder;
if (properties_ != NULL)
- properties_ = properties_->ReplaceAll(context, builder, $ CYThis(), false);
+ properties_ = properties_->ReplaceAll(context, builder, $ CYThis(), seed != this);
if (builder) {
- return $C1($M($ CYFunctionExpression(NULL, builder.declarations_->Parameter(context),
- builder.statements_->*
- $ CYReturn($ CYThis())
- ), $S("call")), this, builder.declarations_->Argument(context));
+ return $C1($M($ CYFunctionExpression(NULL, builder.bindings_->Parameter(context),
+ builder.statements_
+ ->* $ CYReturn($ CYThis())
+ ), $S("call")), seed, builder.bindings_->Argument(context));
}
CYForEach (property, properties_)
property->Replace(context);
- return this;
+ return seed;
}
-CYExpression *CYParenthetical::Replace(CYContext &context) {
- return expression_;
+CYTarget *CYObject::Replace(CYContext &context) {
+ return Replace(context, this);
+}
+
+CYTarget *CYParenthetical::Replace(CYContext &context) {
+ // XXX: return expression_;
+ context.Replace(expression_);
+ return this;
}
CYExpression *CYPostfix::Replace(CYContext &context) {
}
CYProperty *CYProperty::ReplaceAll(CYContext &context, CYBuilder &builder, CYExpression *self, bool update) {
- update |= name_->Computed();
+ update |= Update();
if (update)
Replace(context, builder, self, false);
if (next_ != NULL)
CYExpression *name(name_->PropertyName(context));
if (name_->Computed()) {
CYIdentifier *unique(context.Unique());
- builder.declarations_->*$L1($L(unique, name));
+ builder.bindings_
+ ->* $B1($B(unique, name));
name = $V(unique);
}
Replace(context, builder, self, name, protect);
}
+bool CYProperty::Update() const {
+ return name_->Computed();
+}
+
void CYPropertyGetter::Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect) {
CYIdentifier *unique(context.Unique());
- builder.declarations_
- ->* $L1($L(unique, CYSuperize(context, $ CYFunctionExpression(NULL, parameters_, code_))));
+ builder.bindings_
+ ->* $B1($B(unique, CYSuperize(context, $ CYFunctionExpression(NULL, parameters_, code_))));
builder.statements_
->* CYDefineProperty(self, name, true, !protect, $ CYPropertyValue($S("get"), $V(unique)));
}
void CYPropertyMethod::Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect) {
CYIdentifier *unique(context.Unique());
- builder.declarations_
- ->* $L1($L(unique, CYSuperize(context, $ CYFunctionExpression(NULL, parameters_, code_))));
+ builder.bindings_
+ ->* $B1($B(unique, CYSuperize(context, $ CYFunctionExpression(NULL, parameters_, code_))));
builder.statements_
->* (!protect ? $E($ CYAssign($M(self, name), $V(unique))) :
CYDefineProperty(self, name, true, !protect, $ CYPropertyValue($S("value"), $V(unique), $ CYPropertyValue($S("writable"), $ CYTrue()))));
}
+bool CYPropertyMethod::Update() const {
+ return true;
+}
+
void CYPropertySetter::Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect) {
CYIdentifier *unique(context.Unique());
- builder.declarations_
- ->* $L1($L(unique, CYSuperize(context, $ CYFunctionExpression(NULL, parameters_, code_))));
+ builder.bindings_
+ ->* $B1($B(unique, CYSuperize(context, $ CYFunctionExpression(NULL, parameters_, code_))));
builder.statements_
->* CYDefineProperty(self, name, true, !protect, $ CYPropertyValue($S("set"), $V(unique)));
}
void CYPropertyValue::Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect) {
_assert(!protect);
CYIdentifier *unique(context.Unique());
- builder.declarations_
- ->* $L1($L(unique, value_));
+ builder.bindings_
+ ->* $B1($B(unique, value_));
builder.statements_
->* $E($ CYAssign($M(self, name), $V(unique)));
}
context.Replace(value_);
}
-// XXX: this is evil evil black magic. don't ask, don't tell... don't believe!
-#define MappingSet "0etnirsoalfucdphmgyvbxTwSNECAFjDLkMOIBPqzRH$_WXUVGYKQJZ"
-//#define MappingSet "0abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_"
-
-namespace {
- struct IdentifierUsageLess :
- std::binary_function<CYIdentifier *, CYIdentifier *, bool>
- {
- _finline bool operator ()(CYIdentifier *lhs, CYIdentifier *rhs) const {
- if (lhs->usage_ != rhs->usage_)
- return lhs->usage_ > rhs->usage_;
- return lhs < rhs;
- }
- };
-
- typedef std::set<CYIdentifier *, IdentifierUsageLess> IdentifierUsages;
-}
-
void CYScript::Replace(CYContext &context) {
- CYScope scope(true, context);
+ CYScope scope(false, context);
+ context.scope_->Damage();
context.nextlocal_ = $ CYNonLocal();
context.ReplaceAll(code_);
scope.Close(context, code_);
- size_t offset(0);
-
- CYCStringSet external;
- for (CYIdentifierValueSet::const_iterator i(scope.identifiers_.begin()); i != scope.identifiers_.end(); ++i)
- external.insert((*i)->Word());
-
- IdentifierUsages usages;
-
- if (offset < context.rename_.size())
- CYForEach (i, context.rename_[offset].identifier_)
- usages.insert(i);
-
- // XXX: totalling the probable occurrences and sorting by them would improve the result
- for (CYIdentifierUsageVector::const_iterator i(context.rename_.begin()); i != context.rename_.end(); ++i, ++offset) {
- //std::cout << *i << ":" << (*i)->offset_ << std::endl;
+ unsigned offset(0);
+ for (std::vector<CYIdentifier *>::const_iterator i(context.replace_.begin()); i != context.replace_.end(); ++i) {
const char *name;
-
if (context.options_.verbose_)
- name = $pool.strcat("$", $pool.itoa(offset), NULL);
+ name = $pool.strcat("$", $pool.itoa(offset++), NULL);
else {
char id[8];
id[7] = '\0';
id:
- unsigned position(7), local(offset + 1);
+ unsigned position(7), local(offset++ + 1);
do {
unsigned index(local % (sizeof(MappingSet) - 1));
id[--position] = MappingSet[index];
} while (local != 0);
- if (external.find(id + position) != external.end()) {
- ++offset;
+ if (scope.Lookup(context, id + position) != NULL)
goto id;
- }
+ // XXX: at some point, this could become a keyword
name = $pool.strmemdup(id + position, 7 - position);
- // XXX: at some point, this could become a keyword
}
- CYForEach (identifier, i->identifier_)
- identifier->Set(name);
+ CYIdentifier *identifier(*i);
+ _assert(identifier->next_ == identifier);
+ identifier->next_ = $I(name);
}
}
+CYTarget *CYResolveMember::Replace(CYContext &context) {
+ return $M($M(object_, $S("$cyr")), property_);
+}
+
CYStatement *CYReturn::Replace(CYContext &context) {
if (context.nonlocal_ != NULL) {
CYProperty *value(value_ == NULL ? NULL : $ CYPropertyValue($S("$cyv"), value_));
return this;
}
-CYExpression *CYRubyBlock::Replace(CYContext &context) {
- return call_->AddArgument(context, proc_->Replace(context));
+CYTarget *CYRubyBlock::Replace(CYContext &context) {
+ return lhs_->AddArgument(context, proc_->Replace(context));
}
-CYExpression *CYRubyBlock::AddArgument(CYContext &context, CYExpression *value) {
+CYTarget *CYRubyBlock::AddArgument(CYContext &context, CYExpression *value) {
return Replace(context)->AddArgument(context, value);
}
-CYExpression *CYRubyProc::Replace(CYContext &context) {
+CYTarget *CYRubyProc::Replace(CYContext &context) {
CYFunctionExpression *function($ CYFunctionExpression(NULL, parameters_, code_));
function = CYNonLocalize(context, function);
function->implicit_ = true;
CYScope::CYScope(bool transparent, CYContext &context) :
transparent_(transparent),
- parent_(context.scope_)
+ parent_(context.scope_),
+ damaged_(false),
+ shadow_(NULL),
+ internal_(NULL)
{
+ _assert(!transparent_ || parent_ != NULL);
context.scope_ = this;
}
-void CYScope::Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags) {
- if (!transparent_ || flags == CYIdentifierArgument || flags == CYIdentifierCatch)
- internal_.insert(CYIdentifierAddressFlagsMap::value_type(identifier, flags));
- else if (parent_ != NULL)
- parent_->Declare(context, identifier, flags);
+void CYScope::Damage() {
+ damaged_ = true;
+ if (parent_ != NULL)
+ parent_->Damage();
}
-CYIdentifier *CYScope::Lookup(CYContext &context, CYIdentifier *identifier) {
- std::pair<CYIdentifierValueSet::iterator, bool> insert(identifiers_.insert(identifier));
- return *insert.first;
+CYIdentifierFlags *CYScope::Lookup(CYContext &context, const char *word) {
+ CYForEach (i, internal_)
+ if (strcmp(i->identifier_->Word(), word) == 0)
+ return i;
+ return NULL;
}
-void CYScope::Merge(CYContext &context, CYIdentifier *identifier) {
- std::pair<CYIdentifierValueSet::iterator, bool> insert(identifiers_.insert(identifier));
- if (!insert.second) {
- if ((*insert.first)->offset_ < identifier->offset_)
- (*insert.first)->offset_ = identifier->offset_;
- identifier->replace_ = *insert.first;
- (*insert.first)->usage_ += identifier->usage_ + 1;
- }
+CYIdentifierFlags *CYScope::Lookup(CYContext &context, CYIdentifier *identifier) {
+ return Lookup(context, identifier->Word());
}
-namespace {
- struct IdentifierOffset {
- size_t offset_;
- CYIdentifierFlags flags_;
- size_t usage_;
- CYIdentifier *identifier_;
+CYIdentifierFlags *CYScope::Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierKind kind) {
+ _assert(identifier->next_ == NULL || identifier->next_ == identifier);
- IdentifierOffset(CYIdentifier *identifier, CYIdentifierFlags flags) :
- offset_(identifier->offset_),
- flags_(flags),
- usage_(identifier->usage_),
- identifier_(identifier)
- {
- }
- };
+ CYIdentifierFlags *existing(Lookup(context, identifier));
+ if (existing == NULL)
+ internal_ = $ CYIdentifierFlags(identifier, kind, internal_);
+ ++internal_->count_;
+ if (existing == NULL)
+ return internal_;
- struct IdentifierOffsetLess :
- std::binary_function<const IdentifierOffset &, const IdentifierOffset &, bool>
- {
- _finline bool operator ()(const IdentifierOffset &lhs, const IdentifierOffset &rhs) const {
- if (lhs.offset_ != rhs.offset_)
- return lhs.offset_ < rhs.offset_;
- if (lhs.flags_ != rhs.flags_)
- return lhs.flags_ < rhs.flags_;
- /*if (lhs.usage_ != rhs.usage_)
- return lhs.usage_ < rhs.usage_;*/
- return lhs.identifier_ < rhs.identifier_;
- }
- };
+ if (kind == CYIdentifierGlobal);
+ else if (existing->kind_ == CYIdentifierGlobal || existing->kind_ == CYIdentifierMagic)
+ existing->kind_ = kind;
+ else if (existing->kind_ == CYIdentifierLexical || kind == CYIdentifierLexical)
+ _assert(false);
+ else if (transparent_ && existing->kind_ == CYIdentifierArgument && kind == CYIdentifierVariable)
+ _assert(false);
+ // XXX: throw new SyntaxError() instead of these asserts
+
+ return existing;
+}
+
+void CYScope::Merge(CYContext &context, const CYIdentifierFlags *flags) {
+ _assert(flags->identifier_->next_ == flags->identifier_);
+ CYIdentifierFlags *existing(Declare(context, flags->identifier_, flags->kind_));
+ flags->identifier_->next_ = existing->identifier_;
- typedef std::set<IdentifierOffset, IdentifierOffsetLess> IdentifierOffsets;
+ existing->count_ += flags->count_;
+ if (existing->offset_ < flags->offset_)
+ existing->offset_ = flags->offset_;
}
void CYScope::Close(CYContext &context, CYStatement *&statements) {
+ Close(context);
+
+ CYList<CYBindings> bindings;
+
+ CYForEach (i, internal_)
+ if (i->kind_ == CYIdentifierVariable)
+ bindings
+ ->* $ CYBindings($ CYBinding(i->identifier_));
+
+ if (bindings) {
+ CYVar *var($ CYVar(bindings));
+ var->SetNext(statements);
+ statements = var;
+ }
+}
+
+void CYScope::Close(CYContext &context) {
context.scope_ = parent_;
- if (parent_ == NULL)
- return;
+ CYForEach (i, internal_) {
+ _assert(i->identifier_->next_ == i->identifier_);
+ switch (i->kind_) {
+ case CYIdentifierLexical: {
+ if (!damaged_) {
+ CYIdentifier *replace(context.Unique());
+ replace->next_ = replace;
+ i->identifier_->next_ = replace;
+ i->identifier_ = replace;
+ }
- CYDeclarations *last(NULL), *curr(NULL);
+ if (!transparent_)
+ i->kind_ = CYIdentifierVariable;
+ else
+ parent_->Declare(context, i->identifier_, CYIdentifierVariable);
+ } break;
- IdentifierOffsets offsets;
+ case CYIdentifierVariable: {
+ if (transparent_) {
+ parent_->Declare(context, i->identifier_, i->kind_);
+ i->kind_ = CYIdentifierGlobal;
+ }
+ } break;
+ default:; } }
- for (CYIdentifierAddressFlagsMap::const_iterator i(internal_.begin()); i != internal_.end(); ++i)
- if (i->second != CYIdentifierMagic)
- offsets.insert(IdentifierOffset(i->first, i->second));
+ if (damaged_)
+ return;
- size_t offset(0);
+ typedef std::multimap<unsigned, CYIdentifier *> CYIdentifierOffsetMap;
+ CYIdentifierOffsetMap offsets;
- for (IdentifierOffsets::const_iterator i(offsets.begin()); i != offsets.end(); ++i) {
- if (i->flags_ == CYIdentifierVariable) {
- CYDeclarations *next($ CYDeclarations($ CYDeclaration(i->identifier_)));
- if (last == NULL)
- last = next;
- if (curr != NULL)
- curr->SetNext(next);
- curr = next;
- }
+ CYForEach (i, internal_) {
+ _assert(i->identifier_->next_ == i->identifier_);
+ switch (i->kind_) {
+ case CYIdentifierArgument:
+ case CYIdentifierVariable:
+ offsets.insert(CYIdentifierOffsetMap::value_type(i->offset_, i->identifier_));
+ break;
+ default:; } }
- if (offset < i->offset_)
- offset = i->offset_;
- if (context.rename_.size() <= offset)
- context.rename_.resize(offset + 1);
+ unsigned offset(0);
- CYIdentifierUsage &rename(context.rename_[offset++]);
- i->identifier_->SetNext(rename.identifier_);
- rename.identifier_ = i->identifier_;
- rename.usage_ += i->identifier_->usage_ + 1;
- }
+ for (CYIdentifierOffsetMap::const_iterator i(offsets.begin()); i != offsets.end(); ++i) {
+ if (offset < i->first)
+ offset = i->first;
+ CYIdentifier *identifier(i->second);
- if (last != NULL) {
- CYVar *var($ CYVar(last));
- var->SetNext(statements);
- statements = var;
- }
+ if (offset >= context.replace_.size())
+ context.replace_.resize(offset + 1, NULL);
+ CYIdentifier *&replace(context.replace_[offset++]);
- for (CYIdentifierValueSet::const_iterator i(identifiers_.begin()); i != identifiers_.end(); ++i)
- if (internal_.find(*i) == internal_.end()) {
- //std::cout << *i << '=' << offset << std::endl;
- if ((*i)->offset_ < offset)
- (*i)->offset_ = offset;
- parent_->Merge(context, *i);
+ if (replace == NULL)
+ replace = identifier;
+ else {
+ _assert(replace->next_ == replace);
+ identifier->next_ = replace;
}
+ }
+
+ if (parent_ == NULL)
+ return;
+
+ CYForEach (i, internal_) {
+ switch (i->kind_) {
+ case CYIdentifierGlobal: {
+ if (i->offset_ < offset)
+ i->offset_ = offset;
+ parent_->Merge(context, i);
+ } break;
+ default:; } }
+}
+
+CYTarget *CYSubscriptMember::Replace(CYContext &context) {
+ return $C1($M(object_, $S("$cyg")), property_);
}
CYElementValue *CYSpan::Replace(CYContext &context) { $T(NULL)
return $S(value, size);
}
+CYIdentifier *CYString::Identifier() const {
+ if (const char *word = Word())
+ return $ CYIdentifier(word);
+ return NULL;
+}
+
CYNumber *CYString::Number(CYContext &context) {
// XXX: there is a precise algorithm for this
return NULL;
return this;
}
-CYExpression *CYSuperAccess::Replace(CYContext &context) {
+CYStatement *CYStructDefinition::Replace(CYContext &context) {
+ CYTarget *target(tail_->Replace(context));
+ if (name_ != NULL)
+ target = $C1($M(target, $S("withName")), $S(name_->Word()));
+ return $ CYLexical(false, $B1($B($I($pool.strcat(name_->Word(), "$cy", NULL)), target)));
+}
+
+CYTarget *CYStructTail::Replace(CYContext &context) {
+ CYList<CYElementValue> types;
+ CYList<CYElementValue> names;
+
+ CYForEach (field, fields_) {
+ types->*$ CYElementValue(field->type_->Replace(context));
+
+ CYExpression *name;
+ if (field->name_ == NULL)
+ name = NULL;
+ else
+ name = field->name_->PropertyName(context);
+ names->*$ CYElementValue(name);
+ }
+
+ return $N2($V("Type"), $ CYArray(types), $ CYArray(names));
+}
+
+CYTarget *CYSuperAccess::Replace(CYContext &context) {
return $C1($M($M($M($V(context.super_), $S("prototype")), property_), $S("bind")), $ CYThis());
}
-CYExpression *CYSuperCall::Replace(CYContext &context) {
+CYTarget *CYSuperCall::Replace(CYContext &context) {
return $C($C1($M($V(context.super_), $S("bind")), $ CYThis()), arguments_);
}
+CYTarget *CYSymbol::Replace(CYContext &context) {
+ return $C1($M($V("Symbol"), $S("for")), $S(name_));
+}
+
CYStatement *CYSwitch::Replace(CYContext &context) {
context.Replace(value_);
clauses_->Replace(context);
return this;
}
-CYExpression *CYTemplate::Replace(CYContext &context) {
+CYStatement *CYTarget::Initialize(CYContext &context, CYExpression *value) {
+ if (value == NULL)
+ return NULL;
+ return $E($ CYAssign(this, value));
+}
+
+CYTarget *CYTemplate::Replace(CYContext &context) {
return $C2($M($M($M($V("String"), $S("prototype")), $S("concat")), $S("apply")), $S(""), $ CYArray($ CYElementValue(string_, spans_->Replace(context))));
}
-CYExpression *CYThis::Replace(CYContext &context) {
+CYTarget *CYThis::Replace(CYContext &context) {
if (context.this_ != NULL)
return $V(context.this_->Identifier(context));
return this;
} }
-CYExpression *CYTrivial::Replace(CYContext &context) {
+CYTarget *CYTrivial::Replace(CYContext &context) {
return this;
}
namespace Syntax {
CYStatement *Try::Replace(CYContext &context) {
+ CYScope scope(true, context);
context.ReplaceAll(code_);
+ scope.Close(context);
+
catch_->Replace(context);
finally_->Replace(context);
return this;
} }
-CYExpression *CYTypeArrayOf::Replace_(CYContext &context, CYExpression *type) {
+CYTarget *CYTypeArrayOf::Replace_(CYContext &context, CYTarget *type) {
return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("arrayOf")), $ CYArgument(size_)));
}
-CYExpression *CYTypeBlockWith::Replace_(CYContext &context, CYExpression *type) {
+CYTarget *CYTypeBlockWith::Replace_(CYContext &context, CYTarget *type) {
return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("blockWith")), parameters_->Argument(context)));
}
-CYExpression *CYTypeConstant::Replace_(CYContext &context, CYExpression *type) {
+CYTarget *CYTypeCharacter::Replace(CYContext &context) {
+ switch (signing_) {
+ case CYTypeNeutral: return $V("char");
+ case CYTypeSigned: return $V("schar");
+ case CYTypeUnsigned: return $V("uchar");
+ default: _assert(false);
+ }
+}
+
+CYTarget *CYTypeConstant::Replace_(CYContext &context, CYTarget *type) {
return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("constant"))));
}
CYStatement *CYTypeDefinition::Replace(CYContext &context) {
- return $E($ CYAssign($V(typed_->identifier_), typed_->Replace(context)));
+ return $ CYLexical(false, $B1($B(name_, $ CYTypeExpression(type_))));
+}
+
+CYTarget *CYTypeEnum::Replace(CYContext &context) {
+ CYList<CYProperty> properties;
+ CYForEach (constant, constants_)
+ properties->*$ CYPropertyValue($S(constant->name_->Word()), constant->value_);
+ CYObject *constants($ CYObject(properties));
+
+ if (specifier_ == NULL)
+ return $N1($V("Type"), constants);
+ else
+ return $C1($M(specifier_->Replace(context), $S("enumFor")), constants);
}
-CYExpression *CYTypeError::Replace(CYContext &context) {
+CYTarget *CYTypeError::Replace(CYContext &context) {
_assert(false);
return NULL;
}
-CYExpression *CYTypeModifier::Replace(CYContext &context, CYExpression *type) { $T(type)
- return Replace_(context, type);
+CYTarget *CYTypeExpression::Replace(CYContext &context) {
+ return typed_->Replace(context);
}
-CYExpression *CYTypeFunctionWith::Replace_(CYContext &context, CYExpression *type) {
- return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("functionWith")), parameters_->Argument(context)));
+CYTarget *CYTypeInt128::Replace(CYContext &context) {
+ return $V(signing_ == CYTypeUnsigned ? "uint128" : "int128");
}
-CYExpression *CYTypeLong::Replace(CYContext &context) {
- return $ CYCall($ CYDirectMember(specifier_->Replace(context), $ CYString("long")));
+CYTarget *CYTypeIntegral::Replace(CYContext &context) {
+ bool u(signing_ == CYTypeUnsigned);
+ switch (length_) {
+ case 0: return $V(u ? "ushort" : "short");
+ case 1: return $V(u ? "uint" : "int");
+ case 2: return $V(u ? "ulong" : "long");
+ case 3: return $V(u ? "ulonglong" : "longlong");
+ default: _assert(false);
+ }
}
-CYExpression *CYTypePointerTo::Replace_(CYContext &context, CYExpression *type) {
- return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("pointerTo"))));
+CYTarget *CYTypeModifier::Replace(CYContext &context, CYTarget *type) { $T(type)
+ return Replace_(context, type);
}
-CYExpression *CYTypeShort::Replace(CYContext &context) {
- return $ CYCall($ CYDirectMember(specifier_->Replace(context), $ CYString("short")));
+CYTarget *CYTypeFunctionWith::Replace_(CYContext &context, CYTarget *type) {
+ CYList<CYArgument> arguments(parameters_->Argument(context));
+ if (variadic_)
+ arguments->*$C_($ CYNull());
+ return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("functionWith")), arguments));
+}
+
+CYTarget *CYTypePointerTo::Replace_(CYContext &context, CYTarget *type) {
+ return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("pointerTo"))));
}
-CYExpression *CYTypeSigned::Replace(CYContext &context) {
- return $ CYCall($ CYDirectMember(specifier_->Replace(context), $ CYString("signed")));
+CYTarget *CYTypeReference::Replace(CYContext &context) {
+ const char *prefix;
+ switch (kind_) {
+ case CYTypeReferenceStruct: prefix = "$cys"; break;
+ case CYTypeReferenceEnum: prefix = "$cye"; break;
+ default: _assert(false);
+ }
+
+ return $V($pool.strcat(prefix, name_->Word(), NULL));
}
-CYExpression *CYTypeUnsigned::Replace(CYContext &context) {
- return $ CYCall($ CYDirectMember(specifier_->Replace(context), $ CYString("unsigned")));
+CYTarget *CYTypeStruct::Replace(CYContext &context) {
+ CYTarget *target(tail_->Replace(context));
+ if (name_ != NULL)
+ target = $C1($M(target, $S("withName")), $S(name_->Word()));
+ return target;
}
-CYExpression *CYTypeVariable::Replace(CYContext &context) {
+CYTarget *CYTypeVariable::Replace(CYContext &context) {
return $V(name_);
}
-CYExpression *CYTypeVoid::Replace(CYContext &context) {
+CYTarget *CYTypeVoid::Replace(CYContext &context) {
return $N1($V("Type"), $ CYString("v"));
}
-CYExpression *CYTypeVolatile::Replace_(CYContext &context, CYExpression *type) {
+CYTarget *CYTypeVolatile::Replace_(CYContext &context, CYTarget *type) {
return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("volatile"))));
}
-CYExpression *CYTypedIdentifier::Replace(CYContext &context) {
+CYTarget *CYType::Replace(CYContext &context) {
return modifier_->Replace(context, specifier_->Replace(context));
}
-CYTypeFunctionWith *CYTypedIdentifier::Function() {
- CYTypeModifier **modifier(&modifier_);
- if (*modifier == NULL)
+CYTypeFunctionWith *CYType::Function() {
+ CYTypeModifier *&modifier(CYGetLast(modifier_));
+ if (modifier == NULL)
return NULL;
- while ((*modifier)->next_ != NULL)
- modifier = &(*modifier)->next_;
- CYTypeFunctionWith *function((*modifier)->Function());
+
+ CYTypeFunctionWith *function(modifier->Function());
if (function == NULL)
return NULL;
- *modifier = NULL;
+
+ modifier = NULL;
return function;
}
CYArgument *CYTypedParameter::Argument(CYContext &context) { $T(NULL)
- return $ CYArgument(typed_->Replace(context), next_->Argument(context));
+ return $ CYArgument(type_->Replace(context), next_->Argument(context));
}
CYFunctionParameter *CYTypedParameter::Parameters(CYContext &context) { $T(NULL)
- return $ CYFunctionParameter($ CYDeclaration(typed_->identifier_ ?: context.Unique()), next_->Parameters(context));
+ return $ CYFunctionParameter($ CYBinding(name_ ?: context.Unique()), next_->Parameters(context));
}
CYExpression *CYTypedParameter::TypeSignature(CYContext &context, CYExpression *prefix) { $T(prefix)
- return next_->TypeSignature(context, $ CYAdd(prefix, typed_->Replace(context)));
+ return next_->TypeSignature(context, $ CYAdd(prefix, type_->Replace(context)));
}
-CYStatement *CYVar::Replace(CYContext &context) {
- declarations_->Replace(context);
- if (CYExpression *expression = declarations_->Expression(context))
+CYForInitializer *CYVar::Replace(CYContext &context) {
+ if (CYExpression *expression = bindings_->Replace(context, CYIdentifierVariable))
return $E(expression);
return $ CYEmpty();
}
-CYExpression *CYVariable::Replace(CYContext &context) {
- context.Replace(name_);
+CYTarget *CYVariable::Replace(CYContext &context) {
+ name_ = name_->Replace(context, CYIdentifierGlobal);
return this;
}
CYFunctionParameter *CYVariable::Parameter() const {
- return $ CYFunctionParameter($ CYDeclaration(name_));
+ return $ CYFunctionParameter($ CYBinding(name_));
}
CYStatement *CYWhile::Replace(CYContext &context) {
CYStatement *CYWith::Replace(CYContext &context) {
context.Replace(scope_);
+ CYScope scope(true, context);
+ scope.Damage();
context.ReplaceAll(code_);
+ scope.Close(context);
return this;
}
projects / cycript.git / blobdiff