/* }}} */
#include "cycript.hpp"
-#include "Parser.hpp"
#include <sstream>
+#include "Syntax.hpp"
+
void CYOutput::Terminate() {
- out_ << ';';
+ operator ()(';');
mode_ = NoMode;
}
CYOutput &CYOutput::operator <<(char rhs) {
if (rhs == ' ' || rhs == '\n')
if (pretty_)
- out_ << rhs;
+ operator ()(rhs);
else goto done;
else if (rhs == '\t')
if (pretty_)
for (unsigned i(0); i != indent_; ++i)
- out_ << " ";
+ operator ()(" ", 4);
else goto done;
else if (rhs == '\r') {
if (right_) {
- out_ << '\n';
+ operator ()('\n');
right_ = false;
} goto done;
} else goto work;
work:
if (mode_ == Terminated && rhs != '}') {
right_ = true;
- out_ << ';';
+ operator ()(';');
}
if (rhs == ';') {
}
} else if (rhs == '+') {
if (mode_ == NoPlus)
- out_ << ' ';
+ operator ()(' ');
mode_ = NoPlus;
} else if (rhs == '-') {
if (mode_ == NoHyphen)
- out_ << ' ';
+ operator ()(' ');
mode_ = NoHyphen;
} else if (WordEndRange_[rhs]) {
if (mode_ == NoLetter)
- out_ << ' ';
+ operator ()(' ');
mode_ = NoLetter;
} else none:
mode_ = NoMode;
right_ = true;
- out_ << rhs;
+ operator ()(rhs);
done:
return *this;
}
return *this << *rhs;
if (mode_ == Terminated)
- out_ << ';';
+ operator ()(';');
else if (
mode_ == NoPlus && *rhs == '+' ||
mode_ == NoHyphen && *rhs == '-' ||
mode_ == NoLetter && WordEndRange_[*rhs]
)
- out_ << ' ';
+ operator ()(' ');
- if (WordEndRange_[rhs[size - 1]])
+ char last(rhs[size - 1]);
+ if (WordEndRange_[last] || last == '/')
mode_ = NoLetter;
else
mode_ = NoMode;
right_ = true;
- out_ << rhs;
+ operator ()(rhs, size);
return *this;
}
}
void CYBoolean::Output(CYOutput &out, CYFlags flags) const {
- out << (Value() ? "true" : "false");
+ out << '!' << (Value() ? "0" : "1");
+ if ((flags & CYNoInteger) != 0)
+ out << '.';
}
void CYBreak::Output(CYOutput &out, CYFlags flags) const {
} }
-void CYComment::Output(CYOutput &out, CYFlags flags) const {
- out << '\r';
- out.out_ << value_;
- out.right_ = true;
- out << '\r';
+void CYClassExpression::Output(CYOutput &out, CYFlags flags) const {
+ bool protect((flags & CYNoClass) != 0);
+ if (protect)
+ out << '(';
+ out << "class";
+ if (name_ != NULL)
+ out << ' ' << *name_;
+ out << *tail_;;
+ if (protect)
+ out << ')';
+}
+
+void CYClassStatement::Output(CYOutput &out, CYFlags flags) const {
+ out << "class" << ' ' << *name_ << *tail_;
+}
+
+void CYClassTail::Output(CYOutput &out) const {
+ if (extends_ == NULL)
+ out << ' ';
+ else {
+ out << '\n';
+ ++out.indent_;
+ out << "extends" << ' ';
+ extends_->Output(out, CYAssign::Precedence_ - 1, CYNoFlags);
+ out << '\n';
+ --out.indent_;
+ }
+
+ out << '{' << '\n';
+ ++out.indent_;
+
+ --out.indent_;
+ out << '}';
}
void CYCompound::Output(CYOutput &out, CYFlags flags) const {
}
}
+void CYComputed::PropertyName(CYOutput &out) const {
+ out << '[';
+ expression_->Output(out, CYAssign::Precedence_, CYNoFlags);
+ out << ']';
+}
+
void CYCondition::Output(CYOutput &out, CYFlags flags) const {
test_->Output(out, Precedence() - 1, CYLeft(flags));
out << ' ' << '?' << ' ';
}
void CYClause::Output(CYOutput &out) const {
- if (case_ != NULL)
- out << "case" << ' ' << *case_;
+ out << '\t';
+ if (value_ != NULL)
+ out << "case" << ' ' << *value_;
else
out << "default";
out << ':' << '\n';
+ ++out.indent_;
out << code_;
+ --out.indent_;
out << next_;
}
out << "debugger" << ';';
}
-void CYDeclaration::ForIn(CYOutput &out, CYFlags flags) const {
- out << "var";
- Output(out, CYRight(flags));
-}
-
-void CYDeclaration::Output(CYOutput &out, CYFlags flags) const {
+void CYBinding::Output(CYOutput &out, CYFlags flags) const {
out << *identifier_;
//out.out_ << ':' << identifier_->usage_ << '#' << identifier_->offset_;
- if (initialiser_ != NULL) {
+ if (initializer_ != NULL) {
out << ' ' << '=' << ' ';
- initialiser_->Output(out, CYAssign::Precedence_, CYRight(flags));
+ initializer_->Output(out, CYAssign::Precedence_, CYRight(flags));
}
}
-void CYForDeclarations::Output(CYOutput &out, CYFlags flags) const {
- out << "var";
- declarations_->Output(out, CYRight(flags));
-}
-
-void CYDeclarations::Output(CYOutput &out) const {
+void CYBindings::Output(CYOutput &out) const {
Output(out, CYNoFlags);
}
-void CYDeclarations::Output(CYOutput &out, CYFlags flags) const {
- const CYDeclarations *declaration(this);
+void CYBindings::Output(CYOutput &out, CYFlags flags) const {
+ const CYBindings *binding(this);
bool first(true);
for (;;) {
- CYDeclarations *next(declaration->next_);
+ CYBindings *next(binding->next_);
CYFlags jacks(first ? CYLeft(flags) : next == NULL ? CYRight(flags) : CYCenter(flags));
first = false;
- declaration->declaration_->Output(out, jacks);
+ binding->binding_->Output(out, jacks);
if (next == NULL)
break;
out << ',' << ' ';
- declaration = next;
+ binding = next;
}
}
void CYDoWhile::Output(CYOutput &out, CYFlags flags) const {
out << "do";
- code_->Single(out, CYCenter(flags));
+
+ unsigned line(out.position_.line);
+ unsigned indent(out.indent_);
+ code_->Single(out, CYCenter(flags), CYCompactLong);
+
+ if (out.position_.line != line && out.recent_ == indent)
+ out << ' ';
+ else
+ out << '\n' << '\t';
+
out << "while" << ' ' << '(' << *test_ << ')';
}
-void CYElement::Output(CYOutput &out) const {
+void CYElementSpread::Output(CYOutput &out) const {
+ out << "..." << value_;
+}
+
+void CYElementValue::Output(CYOutput &out) const {
if (value_ != NULL)
value_->Output(out, CYAssign::Precedence_, CYNoFlags);
if (next_ != NULL || value_ == NULL) {
out << ',';
- if (next_ != NULL && next_->value_ != NULL)
+ if (next_ != NULL && !next_->Elision())
out << ' ';
}
if (next_ != NULL)
out.Terminate();
}
-void CYExpress::Output(CYOutput &out, CYFlags flags) const {
- expression_->Output(out, flags | CYNoBF);
- out << ';';
+void CYEval::Output(CYOutput &out, CYFlags flags) const {
+ _assert(false);
}
-void CYExpression::ClassName(CYOutput &out, bool object) const {
- Output(out, CYAssign::Precedence_, CYNoFlags);
-}
-
-void CYExpression::ForIn(CYOutput &out, CYFlags flags) const {
- Output(out, flags | CYNoRightHand);
+void CYExpress::Output(CYOutput &out, CYFlags flags) const {
+ expression_->Output(out, flags | CYNoBFC);
+ out << ';';
}
void CYExpression::Output(CYOutput &out) const {
}
void CYExternal::Output(CYOutput &out, CYFlags flags) const {
- out << "extern" << abi_ << typed_ << ';';
+ out << "extern" << abi_ << typed_;
+ out.Terminate();
}
void CYFatArrow::Output(CYOutput &out, CYFlags flags) const {
void CYFor::Output(CYOutput &out, CYFlags flags) const {
out << "for" << ' ' << '(';
- if (initialiser_ != NULL)
- initialiser_->Output(out, CYNoIn);
+ if (initializer_ != NULL)
+ initializer_->Output(out, CYNoIn);
out.Terminate();
if (test_ != NULL)
out << ' ';
out << ' ';
out << increment_;
out << ')';
- code_->Single(out, CYRight(flags));
+ code_->Single(out, CYRight(flags), CYCompactShort);
+}
+
+void CYForLexical::Output(CYOutput &out, CYFlags flags) const {
+ out << (constant_ ? "const" : "let") << ' ';
+ binding_->Output(out, CYRight(flags));
+}
+
+void CYForIn::Output(CYOutput &out, CYFlags flags) const {
+ out << "for" << ' ' << '(';
+ initializer_->Output(out, CYNoIn | CYNoRightHand);
+ out << ' ' << "in" << ' ' << *iterable_ << ')';
+ code_->Single(out, CYRight(flags), CYCompactShort);
+}
+
+void CYForInitialized::Output(CYOutput &out, CYFlags flags) const {
+ out << "for" << ' ' << '(' << "var" << ' ';
+ binding_->Output(out, CYNoIn | CYNoRightHand);
+ out << ' ' << "in" << ' ' << *iterable_ << ')';
+ code_->Single(out, CYRight(flags), CYCompactShort);
+}
+
+void CYForInComprehension::Output(CYOutput &out) const {
+ out << "for" << ' ' << '(';
+ binding_->Output(out, CYNoIn | CYNoRightHand);
+ out << ' ' << "in" << ' ' << *iterable_ << ')';
}
void CYForOf::Output(CYOutput &out, CYFlags flags) const {
- out << "for" << ' ' << "each" << ' ' << '(';
- initialiser_->ForIn(out, CYNoIn);
- out << "in" << *set_ << ')';
- code_->Single(out, CYRight(flags));
+ out << "for" << ' ' << '(';
+ initializer_->Output(out, CYNoRightHand);
+ out << ' ' << "of" << ' ' << *iterable_ << ')';
+ code_->Single(out, CYRight(flags), CYCompactShort);
}
void CYForOfComprehension::Output(CYOutput &out) const {
- out << "for" << ' ' << "each" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')' << next_;
+ out << "for" << ' ' << '(';
+ binding_->Output(out, CYNoRightHand);
+ out << ' ' << "of" << ' ' << *iterable_ << ')' << next_;
}
-void CYForIn::Output(CYOutput &out, CYFlags flags) const {
- out << "for" << ' ' << '(';
- if (initialiser_ != NULL)
- initialiser_->ForIn(out, CYNoIn);
- out << "in" << *set_ << ')';
- code_->Single(out, CYRight(flags));
+void CYForVariable::Output(CYOutput &out, CYFlags flags) const {
+ out << "var" << ' ';
+ binding_->Output(out, CYRight(flags));
}
-void CYForInComprehension::Output(CYOutput &out) const {
- out << "for" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')';
+void CYFunction::Output(CYOutput &out) const {
+ out << '(' << parameters_ << ')' << ' ';
+ out << '{' << '\n';
+ ++out.indent_;
+ out << code_;
+ --out.indent_;
+ out << '\t' << '}';
}
-void CYFunction::Output(CYOutput &out, CYFlags flags) const {
+void CYFunctionExpression::Output(CYOutput &out, CYFlags flags) const {
// XXX: one could imagine using + here to save a byte
bool protect((flags & CYNoFunction) != 0);
if (protect)
out << "function";
if (name_ != NULL)
out << ' ' << *name_;
- out << '(' << parameters_ << ')' << ' ';
- out << '{' << '\n';
- ++out.indent_;
- out << code_;
- --out.indent_;
- out << '\t' << '}';
+ CYFunction::Output(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);
+ out << "function" << ' ' << *name_;
+ CYFunction::Output(out);
}
void CYFunctionParameter::Output(CYOutput &out) const {
- initialiser_->Output(out, CYNoFlags);
+ binding_->Output(out, CYNoFlags);
if (next_ != NULL)
out << ',' << ' ' << *next_;
}
const char *CYIdentifier::Word() const {
- return replace_ == NULL || replace_ == this ? CYWord::Word() : replace_->Word();
+ return next_ == NULL || next_ == this ? CYWord::Word() : next_->Word();
}
void CYIf::Output(CYOutput &out, CYFlags flags) const {
else
jacks |= protect ? CYNoFlags : CYCenter(flags);
- true_->Single(out, jacks);
+ unsigned line(out.position_.line);
+ unsigned indent(out.indent_);
+ true_->Single(out, jacks, CYCompactShort);
if (false_ != NULL) {
- out << '\t' << "else";
- false_->Single(out, right);
+ if (out.position_.line != line && out.recent_ == indent)
+ out << ' ';
+ else
+ out << '\n' << '\t';
+
+ out << "else";
+ false_->Single(out, right, CYCompactLong);
}
if (protect)
out << "@import";
}
+void CYIndirect::Output(CYOutput &out, CYFlags flags) const {
+ out << "*";
+ rhs_->Output(out, Precedence(), CYRight(flags));
+}
+
void CYIndirectMember::Output(CYOutput &out, CYFlags flags) const {
object_->Output(out, Precedence(), CYLeft(flags));
if (const char *word = property_->Word())
}
void CYLabel::Output(CYOutput &out, CYFlags flags) const {
- out << *name_ << ':' << ' ';
- statement_->Single(out, CYRight(flags));
+ out << *name_ << ':';
+ statement_->Single(out, CYRight(flags), CYCompactShort);
}
void CYParenthetical::Output(CYOutput &out, CYFlags flags) const {
Multiple(out);
}
+void CYTemplate::Output(CYOutput &out, CYFlags flags) const {
+ _assert(false);
+}
+
void CYTypeArrayOf::Output(CYOutput &out, CYIdentifier *identifier) const {
next_->Output(out, Precedence(), identifier);
out << '[';
}
void CYTypeConstant::Output(CYOutput &out, CYIdentifier *identifier) const {
- out << "const";
+ out << "const" << ' ';
next_->Output(out, Precedence(), identifier);
}
}
void CYTypeDefinition::Output(CYOutput &out, CYFlags flags) const {
- out << "typedef" << *typed_;
+ out << "typedef" << ' ' << *typed_;
+ out.Terminate();
+}
+
+void CYTypeExpression::Output(CYOutput &out, CYFlags flags) const {
+ out << '(' << "typedef" << ' ' << *typed_ << ')';
}
-void CYLetStatement::Output(CYOutput &out, CYFlags flags) const {
- out << "let" << ' ' << '(' << *declarations_ << ')';
- code_->Single(out, CYRight(flags));
+void CYLexical::Output(CYOutput &out, CYFlags flags) const {
+ out << "let" << ' ';
+ bindings_->Output(out, flags); // XXX: flags
+ out << ';';
}
void CYModule::Output(CYOutput &out) const {
} }
void CYNull::Output(CYOutput &out, CYFlags flags) const {
- CYWord::Output(out);
+ out << "null";
}
void CYNumber::Output(CYOutput &out, CYFlags flags) const {
rhs_->Output(out, Precedence(), CYRight(flags));
}
-void CYProgram::Output(CYOutput &out) const {
+void CYScript::Output(CYOutput &out) const {
out << code_;
}
void CYProperty::Output(CYOutput &out) const {
+ if (next_ != NULL || out.pretty_)
+ out << ',';
+ out << '\n' << next_;
+}
+
+void CYPropertyGetter::Output(CYOutput &out) const {
+ out << "get" << ' ';
+ name_->PropertyName(out);
+ CYFunction::Output(out);
+ CYProperty::Output(out);
+}
+
+void CYPropertyMethod::Output(CYOutput &out) const {
+ name_->PropertyName(out);
+ CYFunction::Output(out);
+ CYProperty::Output(out);
+}
+
+void CYPropertySetter::Output(CYOutput &out) const {
+ out << "set" << ' ';
+ name_->PropertyName(out);
+ CYFunction::Output(out);
+ CYProperty::Output(out);
+}
+
+void CYPropertyValue::Output(CYOutput &out) const {
out << '\t';
name_->PropertyName(out);
out << ':' << ' ';
value_->Output(out, CYAssign::Precedence_, CYNoFlags);
- if (next_ != NULL)
- out << ',' << '\n' << *next_;
- else
- out << '\n';
+ CYProperty::Output(out);
}
void CYRegEx::Output(CYOutput &out, CYFlags flags) const {
}
void CYRubyProc::Output(CYOutput &out, CYFlags flags) const {
- // XXX: this is not outputting the parameters
- out << '{' << '\n';
+ out << '{' << ' ' << '|' << parameters_ << '|' << '\n';
++out.indent_;
out << code_;
--out.indent_;
}
}
-void CYStatement::Single(CYOutput &out, CYFlags flags) const {
+void CYStatement::Single(CYOutput &out, CYFlags flags, CYCompactType request) const {
if (this == NULL)
return out.Terminate();
_assert(next_ == NULL);
- out << '\n';
- ++out.indent_;
- out << '\t';
+
+ CYCompactType compact(Compact());
+
+ if (compact >= request)
+ out << ' ';
+ else {
+ out << '\n';
+ ++out.indent_;
+ out << '\t';
+ }
+
Output(out, flags);
- out << '\n';
- --out.indent_;
+
+ if (compact < request)
+ --out.indent_;
}
void CYString::Output(CYOutput &out, CYFlags flags) const {
return value;
}
+void CYSuperAccess::Output(CYOutput &out, CYFlags flags) const {
+ out << "super";
+ if (const char *word = property_->Word())
+ out << '.' << word;
+ else
+ out << '[' << *property_ << ']';
+}
+
+void CYSuperCall::Output(CYOutput &out, CYFlags flags) const {
+ out << "super" << '(' << arguments_ << ')';
+}
+
void CYSwitch::Output(CYOutput &out, CYFlags flags) const {
- out << "switch" << ' ' << '(' << *value_ << ')' << ' ' << '{';
+ out << "switch" << ' ' << '(' << *value_ << ')' << ' ' << '{' << '\n';
+ ++out.indent_;
out << clauses_;
- out << '}';
+ --out.indent_;
+ out << '\t' << '}';
}
void CYThis::Output(CYOutput &out, CYFlags flags) const {
- CYWord::Output(out);
+ out << "this";
}
namespace cy {
out << "signed" << specifier_;
}
+void CYTypeStruct::Output(CYOutput &out) const {
+ out << "struct" << ' ';
+ if (name_ != NULL)
+ out << *name_ << ' ';
+ out << '{' << '\n';
+ ++out.indent_;
+ CYForEach (field, fields_) {
+ out << '\t' << *field->typed_;
+ out.Terminate();
+ out << '\n';
+ }
+ --out.indent_;
+ out << '}';
+}
+
void CYTypeUnsigned::Output(CYOutput &out) const {
out << "unsigned" << specifier_;
}
}
void CYVar::Output(CYOutput &out, CYFlags flags) const {
- out << "var";
- declarations_->Output(out, flags);
+ out << "var" << ' ';
+ bindings_->Output(out, flags); // XXX: flags
out << ';';
}
}
void CYWhile::Output(CYOutput &out, CYFlags flags) const {
- out << "while" << '(' << *test_ << ')';
- code_->Single(out, CYRight(flags));
+ out << "while" << ' ' << '(' << *test_ << ')';
+ code_->Single(out, CYRight(flags), CYCompactShort);
}
void CYWith::Output(CYOutput &out, CYFlags flags) const {
- out << "with" << '(' << *scope_ << ')';
- code_->Single(out, CYRight(flags));
-}
-
-void CYWord::ClassName(CYOutput &out, bool object) const {
- if (object)
- out << "objc_getClass(";
- out << '"' << Word() << '"';
- if (object)
- out << ')';
+ out << "with" << ' ' << '(' << *scope_ << ')';
+ code_->Single(out, CYRight(flags), CYCompactShort);
}
void CYWord::Output(CYOutput &out) const {
out << Word();
- if (out.options_.verbose_)
- out.out_ << '@' << this;
+ if (out.options_.verbose_) {
+ out('@');
+ char number[32];
+ sprintf(number, "%p", this);
+ out(number);
+ }
}
void CYWord::PropertyName(CYOutput &out) const {
projects / cycript.git / blobdiff