Added support for parsing function bodies (and option SkipFunctionBodies).

tritao · tritao · commit 378c9b301e75 · 2019-02-24T17:35:16.000Z
diff --git a/src/CppParser/AST.cpp b/src/CppParser/AST.cpp
@@ -565,7 +565,6 @@ Friend::Friend() : CppSharp::CppParser::AST::Declaration(DeclarationKind::Friend
 
 Friend::~Friend() {}
 
-
 StatementObsolete::StatementObsolete(const std::string& str, StatementClassObsolete stmtClass, Declaration* decl) : string(str), _class(stmtClass), decl(decl) {}
 
 ExpressionObsolete::ExpressionObsolete(const std::string& str, StatementClassObsolete stmtClass, Declaration* decl)
@@ -643,6 +642,7 @@ Function::Function()
     , callingConvention(CallingConvention::Default)
     , specializationInfo(0)
     , instantiatedFrom(0)
+    , bodyStmt(0)
 {
 }
 
diff --git a/src/CppParser/Bindings/CLI/CppParser.cpp b/src/CppParser/Bindings/CLI/CppParser.cpp
@@ -511,6 +511,16 @@ void CppSharp::Parser::CppParserOptions::SkipLayoutInfo::set(bool value)
     ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->skipLayoutInfo = value;
 }
 
+bool CppSharp::Parser::CppParserOptions::SkipFunctionBodies::get()
+{
+    return ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->skipFunctionBodies;
+}
+
+void CppSharp::Parser::CppParserOptions::SkipFunctionBodies::set(bool value)
+{
+    ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->skipFunctionBodies = value;
+}
+
 unsigned int CppSharp::Parser::CppParserOptions::ArgumentsCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->getArgumentsCount();
diff --git a/src/CppParser/Bindings/CLI/CppParser.h b/src/CppParser/Bindings/CLI/CppParser.h
@@ -205,6 +205,12 @@ namespace CppSharp
                 void set(bool);
             }
 
+            property bool SkipFunctionBodies
+            {
+                bool get();
+                void set(bool);
+            }
+
             property unsigned int ArgumentsCount
             {
                 unsigned int get();
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
@@ -44368,6 +44368,9 @@ public partial struct __Internal
                 [FieldOffset(150)]
                 internal byte skipLayoutInfo;
 
+                [FieldOffset(151)]
+                internal byte skipFunctionBodies;
+
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptionsC2Ev")]
@@ -44931,6 +44934,19 @@ public bool SkipLayoutInfo
                 }
             }
 
+            public bool SkipFunctionBodies
+            {
+                get
+                {
+                    return ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->skipFunctionBodies != 0;
+                }
+
+                set
+                {
+                    ((global::CppSharp.Parser.CppParserOptions.__Internal*)__Instance)->skipFunctionBodies = (byte) (value ? 1 : 0);
+                }
+            }
+
             public uint ArgumentsCount
             {
                 get
diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
@@ -44368,6 +44368,9 @@ public partial struct __Internal
                 [FieldOffset(186)]
                 internal byte skipLayoutInfo;
 
+                [FieldOffset(187)]
+                internal byte skipFunctionBodies;
+
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                     EntryPoint="??0CppParserOptions@CppParser@CppSharp@@QAE@XZ")]
@@ -44931,6 +44934,19 @@ public bool SkipLayoutInfo
                 }
             }
 
+            public bool SkipFunctionBodies
+            {
+                get
+                {
+                    return ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->skipFunctionBodies != 0;
+                }
+
+                set
+                {
+                    ((global::CppSharp.Parser.CppParserOptions.__Internal*)__Instance)->skipFunctionBodies = (byte) (value ? 1 : 0);
+                }
+            }
+
             public uint ArgumentsCount
             {
                 get
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
@@ -44367,6 +44367,9 @@ public partial struct __Internal
                 [FieldOffset(290)]
                 internal byte skipLayoutInfo;
 
+                [FieldOffset(291)]
+                internal byte skipFunctionBodies;
+
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptionsC2Ev")]
@@ -44930,6 +44933,19 @@ public bool SkipLayoutInfo
                 }
             }
 
+            public bool SkipFunctionBodies
+            {
+                get
+                {
+                    return ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->skipFunctionBodies != 0;
+                }
+
+                set
+                {
+                    ((global::CppSharp.Parser.CppParserOptions.__Internal*)__Instance)->skipFunctionBodies = (byte) (value ? 1 : 0);
+                }
+            }
+
             public uint ArgumentsCount
             {
                 get
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
@@ -44367,6 +44367,9 @@ public partial struct __Internal
                 [FieldOffset(314)]
                 internal byte skipLayoutInfo;
 
+                [FieldOffset(315)]
+                internal byte skipFunctionBodies;
+
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptionsC2Ev")]
@@ -44930,6 +44933,19 @@ public bool SkipLayoutInfo
                 }
             }
 
+            public bool SkipFunctionBodies
+            {
+                get
+                {
+                    return ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->skipFunctionBodies != 0;
+                }
+
+                set
+                {
+                    ((global::CppSharp.Parser.CppParserOptions.__Internal*)__Instance)->skipFunctionBodies = (byte) (value ? 1 : 0);
+                }
+            }
+
             public uint ArgumentsCount
             {
                 get
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
@@ -44367,6 +44367,9 @@ public partial struct __Internal
                 [FieldOffset(242)]
                 internal byte skipLayoutInfo;
 
+                [FieldOffset(243)]
+                internal byte skipFunctionBodies;
+
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptionsC2Ev")]
@@ -44930,6 +44933,19 @@ public bool SkipLayoutInfo
                 }
             }
 
+            public bool SkipFunctionBodies
+            {
+                get
+                {
+                    return ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->skipFunctionBodies != 0;
+                }
+
+                set
+                {
+                    ((global::CppSharp.Parser.CppParserOptions.__Internal*)__Instance)->skipFunctionBodies = (byte) (value ? 1 : 0);
+                }
+            }
+
             public uint ArgumentsCount
             {
                 get
diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
@@ -44368,6 +44368,9 @@ public partial struct __Internal
                 [FieldOffset(314)]
                 internal byte skipLayoutInfo;
 
+                [FieldOffset(315)]
+                internal byte skipFunctionBodies;
+
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="??0CppParserOptions@CppParser@CppSharp@@QEAA@XZ")]
@@ -44931,6 +44934,19 @@ public bool SkipLayoutInfo
                 }
             }
 
+            public bool SkipFunctionBodies
+            {
+                get
+                {
+                    return ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->skipFunctionBodies != 0;
+                }
+
+                set
+                {
+                    ((global::CppSharp.Parser.CppParserOptions.__Internal*)__Instance)->skipFunctionBodies = (byte) (value ? 1 : 0);
+                }
+            }
+
             public uint ArgumentsCount
             {
                 get
diff --git a/src/CppParser/CppParser.cpp b/src/CppParser/CppParser.cpp
@@ -21,6 +21,7 @@ CppParserOptions::CppParserOptions()
     , unityBuild(false)
     , skipPrivateDeclarations(true)
     , skipLayoutInfo(false)
+    , skipFunctionBodies(true)
 {
 }
 
diff --git a/src/CppParser/CppParser.h b/src/CppParser/CppParser.h
@@ -47,6 +47,7 @@ struct CS_API CppParserOptions
     bool unityBuild;
     bool skipPrivateDeclarations;
     bool skipLayoutInfo;
+    bool skipFunctionBodies;
 };
 
 enum class ParserDiagnosticLevel
diff --git a/src/CppParser/Decl.h b/src/CppParser/Decl.h
@@ -320,6 +320,8 @@ enum class FriendKind
     Undeclared
 };
 
+class Stmt;
+
 class CS_API Function : public DeclarationContext
 {
 public:
@@ -341,6 +343,7 @@ class CS_API Function : public DeclarationContext
     std::string mangled;
     std::string signature;
     std::string body;
+    Stmt* bodyStmt;
     CallingConvention callingConvention;
     VECTOR(Parameter*, Parameters)
     FunctionTemplateSpecialization* specializationInfo;
diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp
@@ -3198,6 +3198,15 @@ void Parser::WalkFunction(const clang::FunctionDecl* FD, Function* F,
         ParamStartLoc = VD->getEndLoc();
     }
 
+    if (!opts->skipFunctionBodies)
+    {
+        if (FD->hasBody())
+        {
+            if (auto Body = FD->getBody())
+                F->bodyStmt = WalkStatement(Body);
+        }
+    }
+
     auto& CXXABI = codeGenTypes->getCXXABI();
     bool HasThisReturn = false;
     if (auto CD = dyn_cast<CXXConstructorDecl>(FD))

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,6 @@ Friend::Friend() : CppSharp::CppParser::AST::Declaration(DeclarationKind::Friend`
`565`	`565`
`566`	`566`	`Friend::~Friend() {}`
`567`	`567`
`568`		`-`
`569`	`568`	`StatementObsolete::StatementObsolete(const std::string& str, StatementClassObsolete stmtClass, Declaration* decl) : string(str), _class(stmtClass), decl(decl) {}`
`570`	`569`
`571`	`570`	`ExpressionObsolete::ExpressionObsolete(const std::string& str, StatementClassObsolete stmtClass, Declaration* decl)`
`@@ -643,6 +642,7 @@ Function::Function()`
`643`	`642`	`, callingConvention(CallingConvention::Default)`
`644`	`643`	`, specializationInfo(0)`
`645`	`644`	`, instantiatedFrom(0)`
	`645`	`+ , bodyStmt(0)`
`646`	`646`	`{`
`647`	`647`	`}`
`648`	`648`
Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,12 @@ namespace CppSharp`
`205`	`205`	`void set(bool);`
`206`	`206`	`}`
`207`	`207`
	`208`	`+ property bool SkipFunctionBodies`
	`209`	`+ {`
	`210`	`+ bool get();`
	`211`	`+ void set(bool);`
	`212`	`+ }`
	`213`	`+`
`208`	`214`	`property unsigned int ArgumentsCount`
`209`	`215`	`{`
`210`	`216`	`unsigned int get();`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ CppParserOptions::CppParserOptions()`
`21`	`21`	`, unityBuild(false)`
`22`	`22`	`, skipPrivateDeclarations(true)`
`23`	`23`	`, skipLayoutInfo(false)`
	`24`	`+ , skipFunctionBodies(true)`
`24`	`25`	`{`
`25`	`26`	`}`
`26`	`27`