X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/c2c9f509581b8c8e78b5745498c782ef1affd51a..fb726fc55e2a79b03564be97d5057e28805d84f0:/Output.cpp diff --git a/Output.cpp b/Output.cpp index ee58d06..c974744 100644 --- a/Output.cpp +++ b/Output.cpp @@ -24,34 +24,6 @@ #include <sstream> -_finline CYFlags operator ~(CYFlags rhs) { - return static_cast<CYFlags>(~static_cast<unsigned>(rhs)); -} - -_finline CYFlags operator &(CYFlags lhs, CYFlags rhs) { - return static_cast<CYFlags>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs)); -} - -_finline CYFlags operator |(CYFlags lhs, CYFlags rhs) { - return static_cast<CYFlags>(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs)); -} - -_finline CYFlags &operator |=(CYFlags &lhs, CYFlags rhs) { - return lhs = lhs | rhs; -} - -_finline CYFlags CYLeft(CYFlags flags) { - return flags & ~(CYNoDangle | CYNoInteger); -} - -_finline CYFlags CYRight(CYFlags flags) { - return flags & ~CYNoBF; -} - -_finline CYFlags CYCenter(CYFlags flags) { - return CYLeft(CYRight(flags)); -} - void CYOutput::Terminate() { out_ << ';'; mode_ = NoMode; @@ -378,8 +350,12 @@ void CYFor::Output(CYOutput &out, CYFlags flags) const { if (initialiser_ != NULL) initialiser_->For(out); out.Terminate(); + if (test_ != NULL) + out << ' '; out << test_; out.Terminate(); + if (increment_ != NULL) + out << ' '; out << increment_; out << ')'; code_->Single(out, CYRight(flags)); @@ -460,7 +436,7 @@ void CYIf::Output(CYOutput &out, CYFlags flags) const { true_->Single(out, jacks); if (false_ != NULL) { - out << "else"; + out << '\t' << "else"; false_->Single(out, right); }