libnativehelper.so was there before JniInvocation.

[cycript.git] / Output.cpp

diff --git a/Output.cpp b/Output.cpp
index d3da0e46fa0564f386acbd333b64451f23bd76ba..155230481932471c7f99e0fde65cd84e6d68c516 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -1,5 +1,5 @@
-/* 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 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -19,12 +19,99 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-#include "cycript.hpp"
-
+#include <cmath>
+#include <iomanip>

 #include <sstream>
 
 #include "Syntax.hpp"
 
 #include <sstream>
 
 #include "Syntax.hpp"
 

+void CYStringify(std::ostringstream &str, const char *data, size_t size, bool c) {
+    bool single;
+    if (c)
+        single = false;
+    else {
+        unsigned quot(0), apos(0);
+        for (const char *value(data), *end(data + size); value != end; ++value)
+            if (*value == '"')
+                ++quot;
+            else if (*value == '\'')
+                ++apos;
+
+        single = quot > apos;
+    }
+
+    str << (single ? '\'' : '"');
+
+    for (const char *value(data), *end(data + size); value != end; ++value)
+        switch (uint8_t next = *value) {
+            case '\\': str << "\\\\"; break;
+            case '\b': str << "\\b"; break;
+            case '\f': str << "\\f"; break;
+            case '\n': str << "\\n"; break;
+            case '\r': str << "\\r"; break;
+            case '\t': str << "\\t"; break;
+            case '\v': str << "\\v"; break;
+
+            case '"':
+                if (!single)
+                    str << "\\\"";
+                else goto simple;
+            break;
+
+            case '\'':
+                if (single)
+                    str << "\\'";
+                else goto simple;
+            break;
+
+            case '\0':
+                if (value[1] >= '0' && value[1] <= '9')
+                    str << "\\x00";
+                else
+                    str << "\\0";
+            break;
+
+            default:
+                if (next >= 0x20 && next < 0x7f) simple:
+                    str << *value;
+                else {
+                    unsigned levels(1);
+                    if ((next & 0x80) != 0)
+                        while ((next & 0x80 >> ++levels) != 0);
+
+                    unsigned point(next & 0xff >> levels);
+                    while (--levels != 0)
+                        point = point << 6 | uint8_t(*++value) & 0x3f;
+
+                    if (point < 0x100)
+                        str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << point;
+                    else if (point < 0x10000)
+                        str << "\\u" << std::setbase(16) << std::setw(4) << std::setfill('0') << point;
+                    else {
+                        point -= 0x10000;
+                        str << "\\u" << std::setbase(16) << std::setw(4) << std::setfill('0') << (0xd800 | point >> 0x0a);
+                        str << "\\u" << std::setbase(16) << std::setw(4) << std::setfill('0') << (0xdc00 | point & 0x3ff);
+                    }
+                }
+        }
+
+    str << (single ? '\'' : '"');
+}
+
+void CYNumerify(std::ostringstream &str, double value) {
+    if (std::isinf(value)) {
+        if (value < 0)
+            str << '-';
+        str << "Infinity";
+        return;
+    }
+
+    char string[32];
+    // XXX: I want this to print 1e3 rather than 1000
+    sprintf(string, "%.17g", value);
+    str << string;
+}
+

 void CYOutput::Terminate() {
     operator ()(';');
     mode_ = NoMode;
 void CYOutput::Terminate() {
     operator ()(';');
     mode_ = NoMode;


@@ -239,7 +326,7 @@ void CYCondition::Output(CYOutput &out, CYFlags flags) const {
     test_->Output(out, Precedence() - 1, CYLeft(flags));
     out << ' ' << '?' << ' ';
     if (true_ != NULL)
     test_->Output(out, Precedence() - 1, CYLeft(flags));
     out << ' ' << '?' << ' ';
     if (true_ != NULL)

-        true_->Output(out, CYAssign::Precedence_, CYNoFlags);
+        true_->Output(out, CYAssign::Precedence_, CYNoColon);

     out << ' ' << ':' << ' ';
     false_->Output(out, CYAssign::Precedence_, CYRight(flags));
 }
     out << ' ' << ':' << ' ';
     false_->Output(out, CYAssign::Precedence_, CYRight(flags));
 }


@@ -253,10 +340,12 @@ void CYContinue::Output(CYOutput &out, CYFlags flags) const {
 
 void CYClause::Output(CYOutput &out) const {
     out << '\t';
 
 void CYClause::Output(CYOutput &out) const {
     out << '\t';

-    if (value_ != NULL)
-        out << "case" << ' ' << *value_;
-    else
+    if (value_ == NULL)

         out << "default";
         out << "default";

+    else {
+        out << "case" << ' ';
+        value_->Output(out, CYNoColon);
+    }

     out << ':' << '\n';
     ++out.indent_;
     out << code_;
     out << ':' << '\n';
     ++out.indent_;
     out << code_;


@@ -363,11 +452,20 @@ void CYExpression::Output(CYOutput &out, int precedence, CYFlags flags) const {
         Output(out, flags);
 }
 
         Output(out, flags);
 }
 

-void CYExternal::Output(CYOutput &out, CYFlags flags) const {
-    out << "extern" << abi_ << typed_;
+void CYExtend::Output(CYOutput &out, CYFlags flags) const {
+    lhs_->Output(out, CYLeft(flags));
+    out << ' ' << object_;
+}
+
+void CYExternalDefinition::Output(CYOutput &out, CYFlags flags) const {
+    out << "extern" << ' ' << abi_ << ' ' << typed_;

     out.Terminate();
 }
 
     out.Terminate();
 }
 

+void CYExternalExpression::Output(CYOutput &out, CYFlags flags) const {
+    out << '(' << "extern" << ' ' << abi_ << ' ' << typed_ << ')';
+}
+

 void CYFatArrow::Output(CYOutput &out, CYFlags flags) const {
     out << '(' << parameters_ << ')' << ' ' << "=>" << ' ' << '{' << code_ << '}';
 }
 void CYFatArrow::Output(CYOutput &out, CYFlags flags) const {
     out << '(' << parameters_ << ')' << ' ' << "=>" << ' ' << '{' << code_ << '}';
 }


@@ -520,6 +618,10 @@ void CYImport::Output(CYOutput &out, CYFlags flags) const {
     out << "@import";
 }
 
     out << "@import";
 }
 

+void CYImportDeclaration::Output(CYOutput &out, CYFlags flags) const {
+    _assert(false);
+}
+

 void CYIndirect::Output(CYOutput &out, CYFlags flags) const {
     out << "*";
     rhs_->Output(out, Precedence(), CYRight(flags));
 void CYIndirect::Output(CYOutput &out, CYFlags flags) const {
     out << "*";
     rhs_->Output(out, Precedence(), CYRight(flags));


@@ -567,7 +669,7 @@ void CYTemplate::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYTypeArrayOf::Output(CYOutput &out, CYIdentifier *identifier) const {
 }
 
 void CYTypeArrayOf::Output(CYOutput &out, CYIdentifier *identifier) const {

-    next_->Output(out, Precedence(), identifier);
+    next_->Output(out, Precedence(), identifier, false);

     out << '[';
     out << size_;
     out << ']';
     out << '[';
     out << size_;
     out << ']';


@@ -575,31 +677,42 @@ void CYTypeArrayOf::Output(CYOutput &out, CYIdentifier *identifier) const {
 
 void CYTypeBlockWith::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << '(' << '^';
 
 void CYTypeBlockWith::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << '(' << '^';

-    next_->Output(out, Precedence(), identifier);
+    next_->Output(out, Precedence(), identifier, false);

     out << ')' << '(' << parameters_ << ')';
 }
 
 void CYTypeConstant::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << ')' << '(' << parameters_ << ')';
 }
 
 void CYTypeConstant::Output(CYOutput &out, CYIdentifier *identifier) const {

-    out << "const" << ' ';
-    next_->Output(out, Precedence(), identifier);
+    out << "const";
+    next_->Output(out, Precedence(), identifier, false);

 }
 
 void CYTypeFunctionWith::Output(CYOutput &out, CYIdentifier *identifier) const {
 }
 
 void CYTypeFunctionWith::Output(CYOutput &out, CYIdentifier *identifier) const {

-    next_->Output(out, Precedence(), identifier);
-    out << '(' << parameters_ << ')';
+    next_->Output(out, Precedence(), identifier, false);
+    out << '(' << parameters_;
+    if (variadic_) {
+        if (parameters_ != NULL)
+            out << ',' << ' ';
+        out << "...";
+    }
+    out << ')';

 }
 
 void CYTypePointerTo::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << '*';
 }
 
 void CYTypePointerTo::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << '*';

-    next_->Output(out, Precedence(), identifier);
+    next_->Output(out, Precedence(), identifier, false);

 }
 
 void CYTypeVolatile::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << "volatile";
 }
 
 void CYTypeVolatile::Output(CYOutput &out, CYIdentifier *identifier) const {
     out << "volatile";

-    next_->Output(out, Precedence(), identifier);
+    next_->Output(out, Precedence(), identifier, true);

 }
 
 }
 

-void CYTypeModifier::Output(CYOutput &out, int precedence, CYIdentifier *identifier) const {
+void CYTypeModifier::Output(CYOutput &out, int precedence, CYIdentifier *identifier, bool space) const {
+    if (this == NULL && identifier == NULL)
+        return;
+    else if (space)
+        out << ' ';
+

     if (this == NULL) {
         out << identifier;
         return;
     if (this == NULL) {
         out << identifier;
         return;


@@ -615,8 +728,8 @@ void CYTypeModifier::Output(CYOutput &out, int precedence, CYIdentifier *identif
 }
 
 void CYTypedIdentifier::Output(CYOutput &out) const {
 }
 
 void CYTypedIdentifier::Output(CYOutput &out) const {

-    specifier_->Output(out);
-    modifier_->Output(out, 0, identifier_);
+    out << *specifier_;
+    modifier_->Output(out, 0, identifier_, true);

 }
 
 void CYEncodedType::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYEncodedType::Output(CYOutput &out, CYFlags flags) const {


@@ -757,6 +870,14 @@ void CYRegEx::Output(CYOutput &out, CYFlags flags) const {
     out << Value();
 }
 
     out << Value();
 }
 

+void CYResolveMember::Output(CYOutput &out, CYFlags flags) const {
+    object_->Output(out, Precedence(), CYLeft(flags));
+    if (const char *word = property_->Word())
+        out << "::" << word;
+    else
+        out << "::" << '[' << *property_ << ']';
+}
+

 void CYReturn::Output(CYOutput &out, CYFlags flags) const {
     out << "return";
     if (value_ != NULL)
 void CYReturn::Output(CYOutput &out, CYFlags flags) const {
     out << "return";
     if (value_ != NULL)


@@ -765,7 +886,7 @@ void CYReturn::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYRubyBlock::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYRubyBlock::Output(CYOutput &out, CYFlags flags) const {

-    call_->Output(out, CYLeft(flags));
+    lhs_->Output(out, CYLeft(flags));

     out << ' ';
     proc_->Output(out, CYRight(flags));
 }
     out << ' ';
     proc_->Output(out, CYRight(flags));
 }


@@ -778,6 +899,11 @@ void CYRubyProc::Output(CYOutput &out, CYFlags flags) const {
     out << '\t' << '}';
 }
 
     out << '\t' << '}';
 }
 

+void CYSubscriptMember::Output(CYOutput &out, CYFlags flags) const {
+    object_->Output(out, Precedence(), CYLeft(flags));
+    out << "." << '[' << *property_ << ']';
+}
+

 void CYStatement::Multiple(CYOutput &out, CYFlags flags) const {
     bool first(true);
     CYForEach (next, this) {
 void CYStatement::Multiple(CYOutput &out, CYFlags flags) const {
     bool first(true);
     CYForEach (next, this) {


@@ -860,6 +986,22 @@ const char *CYString::Word() const {
     return value;
 }
 
     return value;
 }
 

+void CYStructDefinition::Output(CYOutput &out, CYFlags flags) const {
+    out << "struct" << ' ' << *name_ << *tail_;
+}
+
+void CYStructTail::Output(CYOutput &out) const {
+    out << ' ' << '{' << '\n';
+    ++out.indent_;
+    CYForEach (field, fields_) {
+        out << '\t' << *field->typed_;
+        out.Terminate();
+        out << '\n';
+    }
+    --out.indent_;
+    out << '\t' << '}';
+}
+

 void CYSuperAccess::Output(CYOutput &out, CYFlags flags) const {
     out << "super";
     if (const char *word = property_->Word())
 void CYSuperAccess::Output(CYOutput &out, CYFlags flags) const {
     out << "super";
     if (const char *word = property_->Word())


@@ -880,6 +1022,15 @@ void CYSwitch::Output(CYOutput &out, CYFlags flags) const {
     out << '\t' << '}';
 }
 
     out << '\t' << '}';
 }
 

+void CYSymbol::Output(CYOutput &out, CYFlags flags) const {
+    bool protect((flags & CYNoColon) != 0);
+    if (protect)
+        out << '(';
+    out << ':' << name_;
+    if (protect)
+        out << ')';
+}
+

 void CYThis::Output(CYOutput &out, CYFlags flags) const {
     out << "this";
 }
 void CYThis::Output(CYOutput &out, CYFlags flags) const {
     out << "this";
 }


@@ -906,39 +1057,87 @@ void Try::Output(CYOutput &out, CYFlags flags) const {
 
 } }
 
 
 } }
 

+void CYTypeCharacter::Output(CYOutput &out) const {
+    switch (signing_) {
+        case CYTypeNeutral: break;
+        case CYTypeSigned: out << "signed" << ' '; break;
+        case CYTypeUnsigned: out << "unsigned" << ' '; break;
+    }
+
+    out << "char";
+}
+
+void CYTypeEnum::Output(CYOutput &out) const {
+    out << "enum" << ' ';
+    if (name_ != NULL)
+        out << *name_;
+    else {
+        if (specifier_ != NULL)
+            out << ':' << ' ' << *specifier_ << ' ';
+
+        out << '{' << '\n';
+        ++out.indent_;
+        bool comma(false);
+
+        CYForEach (constant, constants_) {
+            if (comma)
+                out << ',' << '\n';
+            else
+                comma = true;
+            out << '\t' << constant->name_;
+            out << ' ' << '=' << ' ' << constant->value_;
+        }
+
+        if (out.pretty_)
+            out << ',';
+        out << '\n';
+        --out.indent_;
+        out << '\t' << '}';
+    }
+}
+

 void CYTypeError::Output(CYOutput &out) const {
     out << "@error";
 }
 
 void CYTypeError::Output(CYOutput &out) const {
     out << "@error";
 }
 

-void CYTypeLong::Output(CYOutput &out) const {
-    out << "long" << specifier_;
-}
+void CYTypeInt128::Output(CYOutput &out) const {
+    switch (signing_) {
+        case CYTypeNeutral: break;
+        case CYTypeSigned: out << "signed" << ' '; break;
+        case CYTypeUnsigned: out << "unsigned" << ' '; break;
+    }

 
 

-void CYTypeShort::Output(CYOutput &out) const {
-    out << "short" << specifier_;
+    out << "__int128";

 }
 
 }
 

-void CYTypeSigned::Output(CYOutput &out) const {
-    out << "signed" << specifier_;
+void CYTypeIntegral::Output(CYOutput &out) const {
+    if (signing_ == CYTypeUnsigned)
+        out << "unsigned" << ' ';
+    switch (length_) {
+        case 0: out << "short"; break;
+        case 1: out << "int"; break;
+        case 2: out << "long"; break;
+        case 3: out << "long" << ' ' << "long"; break;
+        default: _assert(false);
+    }

 }
 
 void CYTypeStruct::Output(CYOutput &out) const {
 }
 
 void CYTypeStruct::Output(CYOutput &out) const {

-    out << "struct" << ' ';
+    out << "struct";

     if (name_ != NULL)
     if (name_ != NULL)

-        out << *name_ << ' ';
-    out << '{' << '\n';
-    ++out.indent_;
-    CYForEach (field, fields_) {
-        out << '\t' << *field->typed_;
-        out.Terminate();
-        out << '\n';
-    }
-    --out.indent_;
-    out << '}';
+        out << ' ' << *name_;
+    else
+        out << *tail_;

 }
 
 }
 

-void CYTypeUnsigned::Output(CYOutput &out) const {
-    out << "unsigned" << specifier_;
+void CYTypeReference::Output(CYOutput &out) const {
+    switch (kind_) {
+        case CYTypeReferenceStruct: out << "struct"; break;
+        case CYTypeReferenceEnum: out << "enum"; break;
+        default: _assert(false);
+    }
+
+    out << ' ' << *name_;

 }
 
 void CYTypeVariable::Output(CYOutput &out) const {
 }
 
 void CYTypeVariable::Output(CYOutput &out) const {