Package everything for Android in simple zip file.

[cycript.git] / Analyze.cpp

diff --git a/Analyze.cpp b/Analyze.cpp
index 466144d1fac5fbcafbc9875a7a41f901ce87df57..49ff5cb5d5c53a04fac2de44e387023544ac80d4 100644 (file)
--- a/Analyze.cpp
+++ b/Analyze.cpp
@@ -28,6 +28,7 @@
 
 #include <clang-c/Index.h>
 
 
 #include <clang-c/Index.h>
 

+#include "Bridge.hpp"

 #include "Functor.hpp"
 #include "Replace.hpp"
 #include "Syntax.hpp"
 #include "Functor.hpp"
 #include "Replace.hpp"
 #include "Syntax.hpp"


@@ -297,6 +298,18 @@ static CYTypedIdentifier *CYDecodeType(CXType type, const CYCXString &identifier
     return typed;
 }
 
     return typed;
 }
 

+static void CYParseStructure(CXCursor cursor, CYTypedIdentifier *typed) {
+    CYList<CYTypeStructField> fields;
+    CYForChild(cursor, fun([&](CXCursor child) {
+        if (clang_getCursorKind(child) == CXCursor_FieldDecl) {
+            CYTypedIdentifier *field(CYDecodeType(clang_getCursorType(child), child));
+            fields->*$ CYTypeStructField(field);
+        }
+    }));
+
+    typed->specifier_ = $ CYTypeStruct(NULL, $ CYStructTail(fields));
+}
+

 static void CYParseCursor(CXType type, CXCursor cursor, CYTypedIdentifier *typed) {
     CYCXString spelling(cursor);
 
 static void CYParseCursor(CXType type, CXCursor cursor, CYTypedIdentifier *typed) {
     CYCXString spelling(cursor);
 


@@ -313,17 +326,8 @@ static void CYParseCursor(CXType type, CXCursor cursor, CYTypedIdentifier *typed
         case CXCursor_StructDecl: {
             if (spelling[0] != '\0')
                 typed->specifier_ = $ CYTypeReference($I(spelling.Pool($pool)));
         case CXCursor_StructDecl: {
             if (spelling[0] != '\0')
                 typed->specifier_ = $ CYTypeReference($I(spelling.Pool($pool)));

-            else {
-                CYList<CYTypeStructField> fields;
-                CYForChild(cursor, fun([&](CXCursor child) {
-                    if (clang_getCursorKind(child) == CXCursor_FieldDecl) {
-                        CYTypedIdentifier *field(CYDecodeType(clang_getCursorType(child), child));
-                        fields->*$ CYTypeStructField(field);
-                    }
-                }));
-
-                typed->specifier_ = $ CYTypeStruct(NULL, $ CYStructTail(fields));
-            }
+            else
+                CYParseStructure(cursor, typed);

         } break;
 
         case CXCursor_UnionDecl: {
         } break;
 
         case CXCursor_UnionDecl: {


@@ -408,6 +412,10 @@ static void CYParseType(CXType type, CYTypedIdentifier *typed) {
             _assert(false);
         break;
 
             _assert(false);
         break;
 

+        case CXType_ObjCClass:
+            typed->specifier_ = $ CYTypeVariable("Class");
+        break;
+

         case CXType_ObjCId:
             typed->specifier_ = $ CYTypeVariable("id");
         break;
         case CXType_ObjCId:
             typed->specifier_ = $ CYTypeVariable("id");
         break;


@@ -476,18 +484,18 @@ static CXChildVisitResult CYChildVisit(CXCursor cursor, CXCursor parent, CXClien
     std::string name(spelling);
     std::ostringstream value;
     unsigned priority(2);
     std::string name(spelling);
     std::ostringstream value;
     unsigned priority(2);

-    unsigned flags(0);
+    unsigned flags(CYBridgeHold);

 
     /*CXSourceLocation location(clang_getCursorLocation(cursor));
     CYCXPosition<> position(location);
     std::cerr << spelling << " " << position << std::endl;*/
 
 
     /*CXSourceLocation location(clang_getCursorLocation(cursor));
     CYCXPosition<> position(location);
     std::cerr << spelling << " " << position << std::endl;*/
 

-    switch (CXCursorKind kind = clang_getCursorKind(cursor)) {
+    try { switch (CXCursorKind kind = clang_getCursorKind(cursor)) {

         case CXCursor_EnumConstantDecl: {
             value << clang_getEnumConstantDeclValue(cursor);
         } break;
 
         case CXCursor_EnumConstantDecl: {
             value << clang_getEnumConstantDeclValue(cursor);
         } break;
 

-        case CXCursor_MacroDefinition: try {
+        case CXCursor_MacroDefinition: {

             CXSourceRange range(clang_getCursorExtent(cursor));
             CYTokens tokens(unit, range);
             _assert(tokens.size() != 0);
             CXSourceRange range(clang_getCursorExtent(cursor));
             CYTokens tokens(unit, range);
             _assert(tokens.size() != 0);


@@ -540,10 +548,6 @@ static CXChildVisitResult CYChildVisit(CXCursor cursor, CXCursor parent, CXClien
                 value << body.str();
                 out << ';' << '}' << ')';
             }
                 value << body.str();
                 out << ';' << '}' << ')';
             }

-        } catch (const CYException &error) {
-            CYPool pool;
-            //std::cerr << error.PoolCString(pool) << std::endl;
-            goto skip;

         } break;
 
         case CXCursor_StructDecl: {
         } break;
 
         case CXCursor_StructDecl: {


@@ -552,22 +556,21 @@ static CXChildVisitResult CYChildVisit(CXCursor cursor, CXCursor parent, CXClien
             if (!clang_isCursorDefinition(cursor))
                 priority = 1;
 
             if (!clang_isCursorDefinition(cursor))
                 priority = 1;
 

-            std::ostringstream types;
-            std::ostringstream names;
+            CYLocalPool pool;

 
 

-            CYForChild(cursor, fun([&](CXCursor child) {
-                if (clang_getCursorKind(child) == CXCursor_FieldDecl) {
-                    CXType type(clang_getCursorType(child));
-                    types << "(typedef " << CYCXString(clang_getTypeSpelling(type)) << "),";
-                    names << "'" << CYCXString(child) << "',";
-                }
-            }));
+            CYTypedIdentifier typed(NULL);
+            CYParseStructure(cursor, &typed);
+
+            CYOptions options;
+            CYOutput out(*value.rdbuf(), options);
+            CYTypeExpression(&typed).Output(out, CYNoBFC);

 
 

-            value << "new Type([" << types.str() << "],[" << names.str() << "]).withName(\"" << name << "\")";
+            value << ".withName(\"" << name << "\")";

             name += "$cy";
             name += "$cy";

+            flags = CYBridgeType;

         } break;
 
         } break;
 

-        case CXCursor_TypedefDecl: try {
+        case CXCursor_TypedefDecl: {

             CYLocalPool local;
 
             CYTypedIdentifier *typed(CYDecodeType(clang_getTypedefDeclUnderlyingType(cursor)));
             CYLocalPool local;
 
             CYTypedIdentifier *typed(CYDecodeType(clang_getTypedefDeclUnderlyingType(cursor)));


@@ -578,14 +581,10 @@ static CXChildVisitResult CYChildVisit(CXCursor cursor, CXCursor parent, CXClien
                 CYOutput out(*value.rdbuf(), options);
                 CYTypeExpression(typed).Output(out, CYNoBFC);
             }
                 CYOutput out(*value.rdbuf(), options);
                 CYTypeExpression(typed).Output(out, CYNoBFC);
             }

-        } catch (const CYException &error) {
-            CYPool pool;
-            //std::cerr << error.PoolCString(pool) << std::endl;
-            goto skip;

         } break;
 
         case CXCursor_FunctionDecl:
         } break;
 
         case CXCursor_FunctionDecl:

-        case CXCursor_VarDecl: try {
+        case CXCursor_VarDecl: {

             std::string label;
 
             CYList<CYFunctionParameter> parameters;
             std::string label;
 
             CYList<CYFunctionParameter> parameters;


@@ -635,24 +634,21 @@ static CXChildVisitResult CYChildVisit(CXCursor cursor, CXCursor parent, CXClien
                 function->Output(out, CYNoBFC);
                 //std::cerr << value.str() << std::endl;
             }
                 function->Output(out, CYNoBFC);
                 //std::cerr << value.str() << std::endl;
             }

-        } catch (const CYException &error) {
-            CYPool pool;
-            //std::cerr << error.PoolCString(pool) << std::endl;
-            goto skip;

         } break;
 
         default: {
             return CXChildVisit_Recurse;
         } break;
         } break;
 
         default: {
             return CXChildVisit_Recurse;
         } break;

-    }
-
-    {
+    } {

         CYKey &key(baton.keys[name]);
         CYKey &key(baton.keys[name]);

-        if (key.priority_ < priority) {
+        if (key.priority_ <= priority) {

             key.priority_ = priority;
             key.code_ = value.str();
             key.flags_ = flags;
         }
             key.priority_ = priority;
             key.code_ = value.str();
             key.flags_ = flags;
         }

+    } } catch (const CYException &error) {
+        CYPool pool;
+        //std::cerr << error.PoolCString(pool) << std::endl;

     }
 
   skip:
     }
 
   skip: