libnativehelper.so was there before JniInvocation.

[cycript.git] / Output.cpp

diff --git a/Output.cpp b/Output.cpp
index dc1f7f997f92b90231ea10d0cf0faaa752872d0b..155230481932471c7f99e0fde65cd84e6d68c516 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -457,11 +457,15 @@ void CYExtend::Output(CYOutput &out, CYFlags flags) const {
     out << ' ' << object_;
 }
 
     out << ' ' << object_;
 }
 

-void CYExternal::Output(CYOutput &out, CYFlags flags) const {
-    out << "extern" << abi_ << typed_;
+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_ << '}';
 }


@@ -665,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 << ']';


@@ -673,17 +677,17 @@ 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);
+    next_->Output(out, Precedence(), identifier, false);

     out << '(' << parameters_;
     if (variadic_) {
         if (parameters_ != NULL)
     out << '(' << parameters_;
     if (variadic_) {
         if (parameters_ != NULL)


@@ -695,15 +699,20 @@ void CYTypeFunctionWith::Output(CYOutput &out, CYIdentifier *identifier) const {
 
 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;


@@ -719,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 {


@@ -990,7 +999,7 @@ void CYStructTail::Output(CYOutput &out) const {
         out << '\n';
     }
     --out.indent_;
         out << '\n';
     }
     --out.indent_;

-    out << '}';
+    out << '\t' << '}';

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


@@ -1058,10 +1067,49 @@ void CYTypeCharacter::Output(CYOutput &out) const {
     out << "char";
 }
 
     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 CYTypeInt128::Output(CYOutput &out) const {
+    switch (signing_) {
+        case CYTypeNeutral: break;
+        case CYTypeSigned: out << "signed" << ' '; break;
+        case CYTypeUnsigned: out << "unsigned" << ' '; break;
+    }
+
+    out << "__int128";
+}
+

 void CYTypeIntegral::Output(CYOutput &out) const {
     if (signing_ == CYTypeUnsigned)
         out << "unsigned" << ' ';
 void CYTypeIntegral::Output(CYOutput &out) const {
     if (signing_ == CYTypeUnsigned)
         out << "unsigned" << ' ';


@@ -1083,7 +1131,13 @@ void CYTypeStruct::Output(CYOutput &out) const {
 }
 
 void CYTypeReference::Output(CYOutput &out) const {
 }
 
 void CYTypeReference::Output(CYOutput &out) const {

-    out << "struct" << ' ' << *name_;
+    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 {