}
_finline CYFlags CYRight(CYFlags flags) {
- return flags & (CYNoIn | CYNoTrailer);
+ return flags & (CYNoIn | CYNoTrailer | CYNoTerminator);
}
bool CYFalse::Value() const {
#define CYPA 16
-void CYAddressOf::Output(std::ostream &out, CYFlags flags) const {
+void CYAddressOf::Output(CYOutput &out, CYFlags flags) const {
rhs_->Output(out, 1, CYLeft(flags));
- out << ".$()";
+ out << ".$cya()";
}
-void CYArgument::Output(std::ostream &out) const {
+void CYArgument::Output(CYOutput &out) const {
if (name_ != NULL) {
out << *name_;
if (value_ != NULL)
}
}
-void CYArray::Output(std::ostream &out, CYFlags flags) const {
+void CYArray::Output(CYOutput &out, CYFlags flags) const {
out << '[';
if (elements_ != NULL)
elements_->Output(out);
out << ']';
}
-void CYAssignment::Output(std::ostream &out, CYFlags flags) const {
- lhs_->Output(out, Precedence() - 1, CYLeft(flags));
+void CYArrayComprehension::Output(CYOutput &out, CYFlags flags) const {
+ // XXX: I don't necc. need the ()s
+ out << "(function($cyv";
+ for (CYComprehension *comprehension(comprehensions_); comprehension != NULL; comprehension = comprehension->next_)
+ if (const char *name = comprehension->Name())
+ out << ',' << name;
+ out << "){";
+ out << "$cyv=[];";
+ comprehensions_->Output(out);
+ out << "$cyv.push(";
+ expression_->Output(out, CYPA, CYNoFlags);
+ out << ");";
+ for (CYComprehension *comprehension(comprehensions_); comprehension != NULL; comprehension = comprehension->next_)
+ comprehension->End_(out);
+ out << "return $cyv;";
+ out << "}())";
+}
+
+void CYAssignment::Output(CYOutput &out, CYFlags flags) const {
+ lhs_->Output(out, Precedence() - 1, CYLeft(flags) | CYNoRightHand);
out << Operator();
rhs_->Output(out, Precedence(), CYRight(flags));
}
-void CYBoolean::Output(std::ostream &out, CYFlags flags) const {
+void CYBlock::Output(CYOutput &out, CYFlags flags) const {
+ statements_->Single(out, flags);
+}
+
+void CYBoolean::Output(CYOutput &out, CYFlags flags) const {
if ((flags & CYNoLeader) != 0)
out << ' ';
out << (Value() ? "true" : "false");
out << ' ';
}
-void CYBreak::Output(std::ostream &out) const {
+void CYBreak::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << "break";
if (label_ != NULL)
out << ' ' << *label_;
- out << ';';
+ if ((flags & CYNoTerminator) == 0)
+ out << ';';
+ else if ((flags & CYNoTrailer) != 0)
+ out << ' ';
}
-void CYCall::Output(std::ostream &out, CYFlags flags) const {
- function_->Output(out, Precedence(), CYLeft(flags));
+void CYCall::Output(CYOutput &out, CYFlags flags) const {
+ bool protect((flags & CYNoCall) != 0);
+ if (protect)
+ out << '(';
+ function_->Output(out, Precedence(), protect ? CYNoFlags : flags);
out << '(';
if (arguments_ != NULL)
arguments_->Output(out);
out << ')';
+ if (protect)
+ out << ')';
+}
+
+void CYCatch::Output(CYOutput &out) const {
+ out << "catch(" << *name_ << "){";
+ if (code_ != NULL)
+ code_->Multiple(out);
+ out << "}";
}
-void CYCatch::Output(std::ostream &out) const {
- out << "catch(" << *name_ << ')';
- code_->Output(out, true);
+void CYCategory::Output(CYOutput &out, CYFlags flags) const {
+ out << "(function($cys,$cyp,$cyc,$cyn,$cyt){";
+ out << "$cyp=object_getClass($cys);";
+ out << "$cyc=$cys;";
+ if (messages_ != NULL)
+ messages_->Output(out, true);
+ out << "})(";
+ name_->ClassName(out, true);
+ out << ')';
+ if ((flags & CYNoTerminator) == 0)
+ out << ';';
}
-void CYClass::Output(std::ostream &out) const {
- out << "(function($cys,$cyc,$cym,$cyn,$cyt){";
- out << "$cyc=objc_allocateClassPair($cys,\"" << *name_ << "\",0);";
+void CYClass::Output(CYOutput &out, CYFlags flags) const {
+ // XXX: I don't necc. need the ()s
+ out << "(function($cys,$cyp,$cyc,$cyn,$cyt,$cym){";
+ out << "$cyp=object_getClass($cys);";
+ out << "$cyc=objc_allocateClassPair($cys,";
+ if (name_ != NULL)
+ name_->ClassName(out, false);
+ else
+ out << "$cyq(\"CY$\")";
+ out << ",0);";
out << "$cym=object_getClass($cyc);";
if (fields_ != NULL)
fields_->Output(out);
if (messages_ != NULL)
- messages_->Output(out);
+ messages_->Output(out, false);
out << "objc_registerClassPair($cyc);";
- out << "})(";
+ out << "return $cyc;";
+ out << "}(";
if (super_ != NULL)
super_->Output(out, CYPA, CYNoFlags);
else
out << "null";
- out << ");";
+ out << "))";
+}
+
+void CYClassExpression::Output(CYOutput &out, CYFlags flags) const {
+ CYClass::Output(out, flags);
+}
+
+void CYClassStatement::Output(CYOutput &out, CYFlags flags) const {
+ CYClass::Output(out, flags);
+}
+
+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);
+}
+
+void CYComprehension::Output(CYOutput &out) const {
+ Begin_(out);
+ if (next_ != NULL)
+ next_->Output(out);
}
-void CYCondition::Output(std::ostream &out, CYFlags flags) const {
+void CYCondition::Output(CYOutput &out, CYFlags flags) const {
test_->Output(out, Precedence() - 1, CYLeft(flags));
out << '?';
if (true_ != NULL)
false_->Output(out, CYPA, CYRight(flags));
}
-void CYContinue::Output(std::ostream &out) const {
+void CYContinue::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << "continue";
if (label_ != NULL)
out << ' ' << *label_;
- out << ';';
+ if ((flags & CYNoTerminator) == 0)
+ out << ';';
+ else if ((flags & CYNoTrailer) != 0)
+ out << ' ';
}
-void CYClause::Output(std::ostream &out) const {
+void CYClause::Output(CYOutput &out) const {
if (case_ != NULL) {
out << "case";
- case_->Output(out, CYNoFlags);
+ case_->Output(out, CYNoLeader);
} else
out << "default";
out << ':';
if (code_ != NULL)
- code_->Output(out, false);
- out << *next_;
+ code_->Multiple(out, next_ == NULL ? CYNoFlags : CYNoTrailer);
+ if (next_ != NULL)
+ out << *next_;
}
-// XXX: deal with NoIn
-void CYDeclaration::Part(std::ostream &out) const {
- out << "var ";
- Output(out);
+const char *CYDeclaration::ForEachIn() const {
+ return identifier_->Value();
+}
+
+void CYDeclaration::ForIn(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
+ out << "var";
+ Output(out, CYRight(flags) | CYNoLeader);
+}
+
+void CYDeclaration::ForEachIn(CYOutput &out) const {
+ out << *identifier_;
}
-void CYDeclaration::Output(std::ostream &out) const {
+void CYDeclaration::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << *identifier_;
if (initialiser_ != NULL) {
out << '=';
- initialiser_->Output(out, CYPA, CYNoFlags);
- }
+ initialiser_->Output(out, CYPA, CYRight(flags));
+ } else if ((flags & CYNoTrailer) != 0)
+ out << ' ';
}
-// XXX: deal with NoIn
-void CYDeclarations::Part(std::ostream &out) const {
- out << "var ";
+void CYDeclarations::For(CYOutput &out) const {
+ out << "var";
+ Output(out, CYNoIn | CYNoLeader);
+}
+void CYDeclarations::Output(CYOutput &out, CYFlags flags) const {
const CYDeclarations *declaration(this);
+ bool first(true);
output:
- out << *declaration->declaration_;
- declaration = declaration->next_;
+ CYDeclarations *next(declaration->next_);
+ CYFlags jacks(first ? CYLeft(flags) : next == NULL ? CYRight(flags) : CYCenter(flags));
+ first = false;
+ declaration->declaration_->Output(out, jacks);
- if (declaration != NULL) {
+ if (next != NULL) {
out << ',';
+ declaration = next;
goto output;
}
}
-void CYDeclarations::Output(std::ostream &out) const {
- Part(out);
- out << ';';
+void CYDirectMember::Output(CYOutput &out, CYFlags flags) const {
+ object_->Output(out, Precedence(), CYLeft(flags));
+ if (const char *word = property_->Word())
+ out << '.' << word;
+ else {
+ out << '[';
+ property_->Output(out, CYNoFlags);
+ out << ']';
+ }
}
-void CYDoWhile::Output(std::ostream &out) const {
- // XXX: extra space character!
- out << "do ";
- code_->Output(out, false);
+void CYDoWhile::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
+ out << "do";
+ code_->Single(out, CYNoLeader | CYNoTrailer);
out << "while(";
test_->Output(out, CYNoFlags);
out << ')';
}
-void CYElement::Output(std::ostream &out) const {
+void CYElement::Output(CYOutput &out) const {
if (value_ != NULL)
value_->Output(out, CYPA, CYNoFlags);
if (next_ != NULL || value_ == NULL)
next_->Output(out);
}
-void CYEmpty::Output(std::ostream &out) const {
+void CYEmpty::Output(CYOutput &out, CYFlags flags) const {
out << ';';
}
-void CYEmpty::Output(std::ostream &out, bool block) const {
- if (next_ != NULL)
- CYSource::Output(out, block);
- else
- out << "{}";
+void CYExpress::Output(CYOutput &out, CYFlags flags) const {
+ bool terminator((flags & CYNoTerminator) == 0);
+ expression_->Output(out, (terminator ? CYLeft(flags) : flags) | CYNoBF);
+ if (terminator)
+ out << ';';
}
-void CYExpress::Output(std::ostream &out) const {
- expression_->Output(out, CYNoFunction | CYNoBrace);
- out << ';';
+void CYExpression::ClassName(CYOutput &out, bool object) const {
+ Output(out, CYPA, CYNoFlags);
}
-void CYExpression::Part(std::ostream &out) const {
- // XXX: this should handle LeftHandSideExpression
+const char *CYExpression::ForEachIn() const {
+ return NULL;
+}
+
+void CYExpression::For(CYOutput &out) const {
Output(out, CYNoIn);
}
-void CYCompound::Output(std::ostream &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);
+void CYExpression::ForEachIn(CYOutput &out) const {
+ Output(out, CYPA, CYNoRightHand);
}
-void CYExpression::Output(std::ostream &out, unsigned precedence, CYFlags flags) const {
- if (precedence < Precedence()) {
+void CYExpression::ForIn(CYOutput &out, CYFlags flags) const {
+ Output(out, flags | CYNoRightHand);
+}
+
+void CYExpression::Output(CYOutput &out, unsigned precedence, CYFlags flags) const {
+ if (precedence < Precedence() || (flags & CYNoRightHand) != 0 && RightHand()) {
out << '(';
Output(out, CYNoFlags);
out << ')';
Output(out, flags);
}
-void CYField::Output(std::ostream &out) const {
+void CYField::Output(CYOutput &out) const {
// XXX: implement!
}
-void CYFor::Output(std::ostream &out) const {
+void CYFinally::Output(CYOutput &out) const {
+ out << "finally{";
+ if (code_ != NULL)
+ code_->Multiple(out);
+ out << "}";
+}
+
+void CYFor::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << "for(";
if (initialiser_ != NULL)
- initialiser_->Part(out);
+ initialiser_->For(out);
out << ';';
if (test_ != NULL)
test_->Output(out, CYNoFlags);
if (increment_ != NULL)
increment_->Output(out, CYNoFlags);
out << ')';
- code_->Output(out, false);
+ code_->Single(out, CYNoFlags);
}
-void CYForIn::Output(std::ostream &out) const {
+void CYForEachIn::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
+
+ out << "with({$cys:0,$cyt:0}){";
+
+ out << "$cys=";
+ set_->Output(out, CYPA, CYNoFlags);
+ out << ";";
+
+ out << "for($cyt in $cys){";
+
+ initialiser_->ForEachIn(out);
+ out << "=$cys[$cyt];";
+
+ code_->Multiple(out);
+
+ out << '}';
+
+ out << '}';
+}
+
+void CYForEachInComprehension::Begin_(CYOutput &out) const {
+ out << "(function($cys){";
+ out << "$cys=";
+ set_->Output(out, CYPA, CYNoFlags);
+ out << ";";
+
+ out << "for(" << *name_ << " in $cys){";
+ out << *name_ << "=$cys[" << *name_ << "];";
+}
+
+void CYForEachInComprehension::End_(CYOutput &out) const {
+ out << "}}());";
+}
+
+void CYForIn::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << "for(";
- initialiser_->Part(out);
- // XXX: deal with this space character!
- out << ' ';
+ initialiser_->ForIn(out, CYNoIn | CYNoTrailer);
out << "in";
set_->Output(out, CYNoLeader);
out << ')';
- code_->Output(out, false);
+ code_->Single(out, CYRight(flags));
}
-void CYFunction::Output(std::ostream &out) const {
- CYLambda::Output(out, CYNoFlags);
+void CYForInComprehension::Begin_(CYOutput &out) const {
+ out << "for(" << *name_ << " in";
+ set_->Output(out, CYNoLeader);
+ out << ')';
}
-void CYFunctionParameter::Output(std::ostream &out) const {
+void CYFunction::Output(CYOutput &out, CYFlags flags) const {
+ bool protect((flags & CYNoFunction) != 0);
+ if (protect)
+ out << '(';
+ else if ((flags & CYNoLeader) != 0)
+ out << ' ';
+ out << "function";
+ if (name_ != NULL)
+ out << ' ' << *name_;
+ out << '(';
+ if (parameters_ != NULL)
+ out << *parameters_;
+ out << "){";
+ if (body_ != NULL)
+ body_->Multiple(out);
+ out << '}';
+ if (protect)
+ out << ')';
+}
+
+void CYFunctionExpression::Output(CYOutput &out, CYFlags flags) const {
+ CYFunction::Output(out, flags);
+}
+
+void CYFunctionStatement::Output(CYOutput &out, CYFlags flags) const {
+ CYFunction::Output(out, flags);
+}
+
+void CYFunctionParameter::Output(CYOutput &out) const {
out << *name_;
if (next_ != NULL) {
out << ',';
}
}
-void CYIf::Output(std::ostream &out) const {
+void CYIf::Output(CYOutput &out, CYFlags flags) const {
+ bool protect(false);
+ if (false_ == NULL && (flags & CYNoDangle) != 0) {
+ protect = true;
+ out << '{';
+ } else if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << "if(";
test_->Output(out, CYNoFlags);
out << ')';
- true_->Output(out, true);
+ CYFlags right(protect ? CYNoFlags : CYRight(flags));
+ CYFlags jacks(CYNoDangle);
+ jacks |= false_ == NULL ? right : CYNoTrailer;
+ true_->Single(out, jacks);
if (false_ != NULL) {
- out << "else ";
- false_->Output(out, false);
+ out << "else";
+ if (protect)
+ right |= CYNoTerminator;
+ false_->Single(out, CYNoLeader | right);
}
+ if (protect)
+ out << '}';
+}
+
+void CYIfComprehension::Begin_(CYOutput &out) const {
+ out << "if(";
+ test_->Output(out, CYNoFlags);
+ out << ')';
}
-void CYIndirect::Output(std::ostream &out, CYFlags flags) const {
+void CYIndirect::Output(CYOutput &out, CYFlags flags) const {
rhs_->Output(out, 1, CYLeft(flags));
- out << "[0]";
+ out << ".$cyi";
+ if ((flags & CYNoTrailer) != 0)
+ out << ' ';
}
-void CYInfix::Output(std::ostream &out, CYFlags flags) const {
+void CYIndirectMember::Output(CYOutput &out, CYFlags flags) const {
+ object_->Output(out, Precedence(), CYLeft(flags));
+ out << ".$cyi";
+ if (const char *word = property_->Word())
+ out << '.' << word;
+ else {
+ out << '[';
+ property_->Output(out, CYNoFlags);
+ out << ']';
+ }
+}
+
+void CYInfix::Output(CYOutput &out, CYFlags flags) const {
const char *name(Operator());
bool protect((flags & CYNoIn) != 0 && strcmp(name, "in"));
if (protect)
CYFlags right(protect ? CYNoFlags : CYRight(flags));
if (alphabetic)
right |= CYNoLeader;
+ if (strcmp(name, "-") == 0)
+ right |= CYNoHyphen;
rhs_->Output(out, Precedence() - 1, right);
if (protect)
out << ')';
}
-void CYLambda::Output(std::ostream &out, CYFlags flags) const {
- bool protect((flags & CYNoFunction) != 0);
- if (protect)
- out << '(';
- out << "function";
- if (name_ != NULL)
- out << ' ' << *name_;
- out << '(';
- if (parameters_ != NULL)
- out << *parameters_;
+void CYLet::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
+ out << "let(";
+ declarations_->Output(out, CYNoFlags);
out << "){";
- if (body_ != NULL)
- body_->Show(out);
- out << '}';
- if (protect)
- out << ')';
-}
-
-void CYMember::Output(std::ostream &out, CYFlags flags) const {
- object_->Output(out, Precedence(), CYLeft(flags));
- if (const char *word = property_->Word())
- out << '.' << word;
- else {
- out << '[';
- property_->Output(out, CYNoFlags);
- out << ']';
- }
+ if (statements_ != NULL)
+ statements_->Multiple(out);
+ out << "}";
}
-void CYMessage::Output(std::ostream &out) const {
+void CYMessage::Output(CYOutput &out, bool replace) const {
if (next_ != NULL)
- next_->Output(out);
+ next_->Output(out, replace);
out << "$cyn=new Selector(\"";
for (CYMessageParameter *parameter(parameter_); parameter != NULL; parameter = parameter->next_)
if (parameter->tag_ != NULL) {
out << ':';
}
out << "\");";
- out << "$cyt=$cyn.type($cys," << (instance_ ? "true" : "false") << ");";
- out << "class_addMethod($cy" << (instance_ ? 'c' : 'm') << ",$cyn,";
+ out << "$cyt=$cyn.type($cy" << (instance_ ? 's' : 'p') << ");";
+ out << "class_" << (replace ? "replace" : "add") << "Method($cy" << (instance_ ? 'c' : 'm') << ",$cyn,";
out << "new Functor(function(self,_cmd";
for (CYMessageParameter *parameter(parameter_); parameter != NULL; parameter = parameter->next_)
if (parameter->name_ != NULL)
out << ',' << *parameter->name_;
out << "){return function(){";
if (body_ != NULL)
- body_->Show(out);
+ body_->Multiple(out);
out << "}.call(self);},$cyt),$cyt);";
}
-void CYNew::Output(std::ostream &out, CYFlags flags) const {
+void CYNew::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << "new";
- constructor_->Output(out, Precedence(), CYCenter(flags) | CYNoLeader);
- out << '(';
- if (arguments_ != NULL)
+ constructor_->Output(out, Precedence(), CYCenter(flags) | CYNoLeader | CYNoCall);
+ if (arguments_ != NULL) {
+ out << '(';
arguments_->Output(out);
- out << ')';
+ out << ')';
+ }
}
-void CYNull::Output(std::ostream &out, CYFlags flags) const {
+void CYNull::Output(CYOutput &out, CYFlags flags) const {
if ((flags & CYNoLeader) != 0)
out << ' ';
CYWord::Output(out);
out << ' ';
}
-void CYNumber::Output(std::ostream &out, CYFlags flags) const {
- if ((flags & CYNoLeader) != 0)
+void CYNumber::Output(CYOutput &out, CYFlags flags) const {
+ double value(Value());
+ if ((flags & CYNoLeader) != 0 || value < 0 && (flags & CYNoHyphen) != 0)
out << ' ';
- // XXX: this is not a useful formatting
- out << Value();
+ // XXX: decide on correct precision
+ out.out_ << std::setprecision(9) << value;
if ((flags & CYNoTrailer) != 0)
out << ' ';
}
-void CYObject::Output(std::ostream &out, CYFlags flags) const {
+void CYNumber::PropertyName(CYOutput &out) const {
+ Output(out, CYNoFlags);
+}
+
+void CYObject::Output(CYOutput &out, CYFlags flags) const {
bool protect((flags & CYNoBrace) != 0);
if (protect)
out << '(';
out << ')';
}
-void CYPostfix::Output(std::ostream &out, CYFlags flags) const {
+void CYPostfix::Output(CYOutput &out, CYFlags flags) const {
lhs_->Output(out, Precedence(), CYLeft(flags));
out << Operator();
}
-void CYPrefix::Output(std::ostream &out, CYFlags flags) const {
+void CYPrefix::Output(CYOutput &out, CYFlags flags) const {
+ const char *name(Operator());
bool alphabetic(Alphabetic());
- out << Operator();
+ if (alphabetic && (flags & CYNoLeader) != 0 || name[0] == '-' && (flags & CYNoHyphen) != 0)
+ out << ' ';
+ out << name;
CYFlags right(CYRight(flags));
if (alphabetic)
right |= CYNoLeader;
rhs_->Output(out, Precedence(), right);
}
-void CYProperty::Output(std::ostream &out) const {
- out << *name_;
+void CYProperty::Output(CYOutput &out) const {
+ name_->PropertyName(out);
out << ':';
value_->Output(out, CYPA, CYNoFlags);
if (next_ != NULL) {
}
}
-void CYReturn::Output(std::ostream &out) const {
+void CYRegEx::Output(CYOutput &out, CYFlags flags) const {
+ out << Value();
+ if ((flags & CYNoTrailer) != 0)
+ out << ' ';
+}
+
+void CYReturn::Output(CYOutput &out, CYFlags flags) const {
+ bool terminator((flags & CYNoTerminator) == 0);
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << "return";
if (value_ != NULL)
- value_->Output(out, CYNoLeader);
- out << ';';
+ value_->Output(out, (terminator ? CYCenter(flags) : flags) | CYNoLeader);
+ if (terminator)
+ out << ';';
}
-void CYSelector::Output(std::ostream &out, CYFlags flags) const {
+void CYSelector::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << "new Selector(\"";
if (name_ != NULL)
name_->Output(out);
out << "\")";
}
-void CYSelectorPart::Output(std::ostream &out) const {
+void CYSelectorPart::Output(CYOutput &out) const {
if (name_ != NULL)
out << *name_;
if (value_)
next_->Output(out);
}
-void CYSend::Output(std::ostream &out, CYFlags flags) const {
+void CYSend::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << "objc_msgSend(";
self_->Output(out, CYPA, CYNoFlags);
out << ",";
if (argument->value_ != NULL)
name << ':';
}
- out << reinterpret_cast<void *>(sel_registerName(name.str().c_str()));
+ out.out_ << reinterpret_cast<void *>(sel_registerName(name.str().c_str()));
for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
if (argument->value_ != NULL) {
out << ",";
out << ')';
}
-void CYSource::Show(std::ostream &out) const {
- for (const CYSource *next(this); next != NULL; next = next->next_)
- next->Output(out);
+void CYStatement::Multiple(CYOutput &out, CYFlags flags) const {
+ bool first(true);
+ for (const CYStatement *next(this); next != NULL; next = next->next_) {
+ bool last(next->next_ == NULL);
+ CYFlags jacks(first ? last ? flags : CYLeft(flags) : last ? CYCenter(flags) : CYRight(flags));
+ if (last)
+ jacks |= CYNoTerminator;
+ first = false;
+ next->Output(out, jacks);
+ }
}
-void CYSource::Output(std::ostream &out, bool block) const {
- if (!block && next_ == NULL)
- Output(out);
- else {
+void CYStatement::Single(CYOutput &out, CYFlags flags) const {
+ if (next_ != NULL) {
out << '{';
- Show(out);
+ Multiple(out);
out << '}';
+ } else {
+ bool protect(false);
+ if (labels_ != NULL && (flags & CYNoLeader) != 0)
+ protect = true;
+ if (protect)
+ out << ' ';
+ for (CYLabel *label(labels_); label != NULL; label = label->next_)
+ out << *label->name_ << ':';
+ Output(out, protect ? CYRight(flags) : flags);
}
}
-void CYString::Output(std::ostream &out, CYFlags flags) const {
+void CYString::Output(CYOutput &out, CYFlags flags) const {
unsigned quot(0), apos(0);
for (const char *value(value_), *end(value_ + size_); value != end; ++value)
if (*value == '"')
default:
if (*value < 0x20 || *value >= 0x7f)
- out << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(*value);
+ out.out_ << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(*value);
else simple:
out << *value;
}
out << (single ? '\'' : '"');
}
-void CYSwitch::Output(std::ostream &out) const {
+void CYString::PropertyName(CYOutput &out) const {
+ if (const char *word = Word())
+ out << word;
+ else
+ Output(out, CYNoFlags);
+}
+
+void CYSwitch::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << "switch(";
value_->Output(out, CYNoFlags);
out << "){";
out << '}';
}
-void CYThis::Output(std::ostream &out, CYFlags flags) const {
+void CYThis::Output(CYOutput &out, CYFlags flags) const {
if ((flags & CYNoLeader) != 0)
out << ' ';
CYWord::Output(out);
out << ' ';
}
-void CYThrow::Output(std::ostream &out) const {
+void CYThrow::Output(CYOutput &out, CYFlags flags) const {
+ bool terminator((flags & CYNoTerminator) == 0);
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << "throw";
if (value_ != NULL)
- value_->Output(out, CYNoLeader);
- out << ';';
+ value_->Output(out, (terminator ? CYCenter(flags) : flags) | CYNoLeader);
+ if (terminator)
+ out << ';';
}
-void CYTry::Output(std::ostream &out) const {
- out << "try";
- try_->Output(out, true);
+void CYTry::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
+ out << "try{";
+ if (code_ != NULL)
+ code_->Multiple(out);
+ out << "}";
if (catch_ != NULL)
- out << catch_;
- if (finally_ != NULL) {
- out << "finally";
- finally_->Output(out, true);
- }
+ catch_->Output(out);
+ if (finally_ != NULL)
+ finally_->Output(out);
+}
+
+void CYVar::Output(CYOutput &out, CYFlags flags) const {
+ bool terminator((flags & CYNoTerminator) == 0);
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
+ out << "var";
+ declarations_->Output(out, (terminator ? CYCenter(flags) : flags) | CYNoLeader);
+ if (terminator)
+ out << ';';
}
-void CYVariable::Output(std::ostream &out, CYFlags flags) const {
+void CYVariable::Output(CYOutput &out, CYFlags flags) const {
if ((flags & CYNoLeader) != 0)
out << ' ';
out << *name_;
out << ' ';
}
-void CYWhile::Output(std::ostream &out) const {
+void CYWhile::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << "while(";
test_->Output(out, CYNoFlags);
out << ')';
- code_->Output(out, false);
+ code_->Single(out, CYRight(flags));
}
-void CYWith::Output(std::ostream &out) const {
+void CYWith::Output(CYOutput &out, CYFlags flags) const {
+ if ((flags & CYNoLeader) != 0)
+ out << ' ';
out << "with(";
scope_->Output(out, CYNoFlags);
out << ')';
- code_->Output(out, false);
+ code_->Single(out, CYRight(flags));
+}
+
+void CYWord::ClassName(CYOutput &out, bool object) const {
+ if (object)
+ out << "objc_getClass(";
+ out << '"' << Value() << '"';
+ if (object)
+ out << ')';
}
-void CYWord::Output(std::ostream &out) const {
+void CYWord::Output(CYOutput &out) const {
out << Value();
}
+
+void CYWord::PropertyName(CYOutput &out) const {
+ Output(out);
+}
projects / cycript.git / blobdiff