Merge pull request #262 from tomba/fix-warnings

Fix CppParser compile warnings

build/LLVM.lua

@@ -32,7 +32,6 @@ function SetupLLVMLibs()
     libdirs { path.join(LLVMBuildDir, "RelWithDebInfo/lib") }
 
   configuration "not vs*"
-    buildoptions { "-fpermissive" }
     defines { "__STDC_CONSTANT_MACROS", "__STDC_LIMIT_MACROS" }
 
   configuration "macosx"

src/Core/Parser/ASTConverter.cs

@@ -657,13 +657,13 @@ namespace CppSharp
         {
             var _rawComment = new AST.RawComment
             {
-                Kind = ConvertRawCommentKind(rawComment.RawCommentKind),
+                Kind = ConvertRawCommentKind(rawComment.Kind),
                 BriefText = rawComment.BriefText,
                 Text = rawComment.Text,
             };
 
-            if (rawComment.FullComment != null)
-                _rawComment.FullComment = commentConverter.Visit(rawComment.FullComment)
+            if (rawComment.FullCommentBlock != null)
+                _rawComment.FullComment = commentConverter.Visit(rawComment.FullCommentBlock)
                     as AST.FullComment;
 
             return _rawComment;

src/CppParser/AST.cpp

@@ -626,7 +626,7 @@ Comment::Comment(CommentKind kind) : Kind(kind) {}
 DEF_STRING(RawComment, Text)
 DEF_STRING(RawComment, BriefText)
 
-RawComment::RawComment() : FullComment(0) {}
+RawComment::RawComment() : FullCommentBlock(0) {}
 
 FullComment::FullComment() : Comment(CommentKind::FullComment) {}
 

src/CppParser/AST.h

@@ -777,10 +777,10 @@ enum struct RawCommentKind
 struct CS_API RawComment
 {
     RawComment();
-    RawCommentKind RawCommentKind;
+    RawCommentKind Kind;
     STRING(Text)
     STRING(BriefText)
-    FullComment* FullComment;
+    FullComment* FullCommentBlock;
 };
 
 #pragma region Commands

src/CppParser/Bindings/CLI/AST.cpp

@@ -2934,23 +2934,23 @@ void CppSharp::Parser::AST::RawComment::BriefText::set(System::String^ s)
     ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->setBriefText(arg0);
 }
 
-CppSharp::Parser::AST::RawCommentKind CppSharp::Parser::AST::RawComment::RawCommentKind::get()
+CppSharp::Parser::AST::RawCommentKind CppSharp::Parser::AST::RawComment::Kind::get()
 {
-    return (CppSharp::Parser::AST::RawCommentKind)((::CppSharp::CppParser::AST::RawComment*)NativePtr)->RawCommentKind;
+    return (CppSharp::Parser::AST::RawCommentKind)((::CppSharp::CppParser::AST::RawComment*)NativePtr)->Kind;
 }
 
-void CppSharp::Parser::AST::RawComment::RawCommentKind::set(CppSharp::Parser::AST::RawCommentKind value)
+void CppSharp::Parser::AST::RawComment::Kind::set(CppSharp::Parser::AST::RawCommentKind value)
 {
-    ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->RawCommentKind = (::CppSharp::CppParser::AST::RawCommentKind)value;
+    ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->Kind = (::CppSharp::CppParser::AST::RawCommentKind)value;
 }
 
-CppSharp::Parser::AST::FullComment^ CppSharp::Parser::AST::RawComment::FullComment::get()
+CppSharp::Parser::AST::FullComment^ CppSharp::Parser::AST::RawComment::FullCommentBlock::get()
 {
-    return (((::CppSharp::CppParser::AST::RawComment*)NativePtr)->FullComment == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::FullComment((::CppSharp::CppParser::AST::FullComment*)((::CppSharp::CppParser::AST::RawComment*)NativePtr)->FullComment);
+    return (((::CppSharp::CppParser::AST::RawComment*)NativePtr)->FullCommentBlock == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::FullComment((::CppSharp::CppParser::AST::FullComment*)((::CppSharp::CppParser::AST::RawComment*)NativePtr)->FullCommentBlock);
 }
 
-void CppSharp::Parser::AST::RawComment::FullComment::set(CppSharp::Parser::AST::FullComment^ value)
+void CppSharp::Parser::AST::RawComment::FullCommentBlock::set(CppSharp::Parser::AST::FullComment^ value)
 {
-    ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->FullComment = (::CppSharp::CppParser::AST::FullComment*)value->NativePtr;
+    ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->FullCommentBlock = (::CppSharp::CppParser::AST::FullComment*)value->NativePtr;
 }
 

src/CppParser/Bindings/CLI/AST.h

@@ -1933,13 +1933,13 @@ namespace CppSharp
                     void set(System::String^);
                 }
 
-                property CppSharp::Parser::AST::RawCommentKind RawCommentKind
+                property CppSharp::Parser::AST::RawCommentKind Kind
                 {
                     CppSharp::Parser::AST::RawCommentKind get();
                     void set(CppSharp::Parser::AST::RawCommentKind);
                 }
 
-                property CppSharp::Parser::AST::FullComment^ FullComment
+                property CppSharp::Parser::AST::FullComment^ FullCommentBlock
                 {
                     CppSharp::Parser::AST::FullComment^ get();
                     void set(CppSharp::Parser::AST::FullComment^);

src/CppParser/Bindings/CSharp/i686-pc-win32/AST.cs

@@ -7081,10 +7081,10 @@ namespace CppSharp
                 public struct Internal
                 {
                     [FieldOffset(0)]
-                    public CppSharp.Parser.AST.RawCommentKind RawCommentKind;
+                    public CppSharp.Parser.AST.RawCommentKind Kind;
 
                     [FieldOffset(52)]
-                    public global::System.IntPtr FullComment;
+                    public global::System.IntPtr FullCommentBlock;
 
                     [SuppressUnmanagedCodeSecurity]
                     [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
@@ -7191,33 +7191,33 @@ namespace CppSharp
                     }
                 }
 
-                public CppSharp.Parser.AST.RawCommentKind RawCommentKind
+                public CppSharp.Parser.AST.RawCommentKind Kind
                 {
                     get
                     {
                         var __ptr = (Internal*)__Instance.ToPointer();
-                        return __ptr->RawCommentKind;
+                        return __ptr->Kind;
                     }
 
                     set
                     {
                         var __ptr = (Internal*)__Instance.ToPointer();
-                        __ptr->RawCommentKind = value;
+                        __ptr->Kind = value;
                     }
                 }
 
-                public CppSharp.Parser.AST.FullComment FullComment
+                public CppSharp.Parser.AST.FullComment FullCommentBlock
                 {
                     get
                     {
                         var __ptr = (Internal*)__Instance.ToPointer();
-                        return (__ptr->FullComment == IntPtr.Zero) ? null : new CppSharp.Parser.AST.FullComment(__ptr->FullComment);
+                        return (__ptr->FullCommentBlock == IntPtr.Zero) ? null : new CppSharp.Parser.AST.FullComment(__ptr->FullCommentBlock);
                     }
 
                     set
                     {
                         var __ptr = (Internal*)__Instance.ToPointer();
-                        __ptr->FullComment = value == (CppSharp.Parser.AST.FullComment) null ? global::System.IntPtr.Zero : value.__Instance;
+                        __ptr->FullCommentBlock = value == (CppSharp.Parser.AST.FullComment) null ? global::System.IntPtr.Zero : value.__Instance;
                     }
                 }
             }

src/CppParser/Comments.cpp

@@ -40,7 +40,7 @@ RawComment* Parser::WalkRawComment(const clang::RawComment* RC)
 
     auto &SM = C->getSourceManager();
     auto Comment = new RawComment();
-    Comment->RawCommentKind = ConvertRawCommentKind(RC->getKind());
+    Comment->Kind = ConvertRawCommentKind(RC->getKind());
     Comment->Text = RC->getRawText(SM);
     Comment->BriefText = RC->getBriefText(*AST);
 
@@ -264,6 +264,6 @@ void Parser::HandleComments(clang::Decl* D, Declaration* Decl)
     if (clang::comments::FullComment* FC = RC->parse(*AST, &C->getPreprocessor(), D))
     {
         auto CB = static_cast<FullComment*>(ConvertCommentBlock(FC));
-        RawComment->FullComment = CB;
+        RawComment->FullCommentBlock = CB;
     }
 }

src/CppParser/CppParser.cpp

@@ -33,7 +33,7 @@ DEF_STRING(ParserTargetInfo, ABI)
 ParserResult::ParserResult()
     : ASTContext(0)
     , Library(0)
-    , Parser(0)
+    , CodeParser(0)
 {
 }
 
@@ -42,12 +42,12 @@ ParserResult::ParserResult(const ParserResult& rhs)
     , Diagnostics(rhs.Diagnostics)
     , ASTContext(rhs.ASTContext)
     , Library(rhs.Library)
-    , Parser(rhs.Parser)
+    , CodeParser(rhs.CodeParser)
 {}
 
 ParserResult::~ParserResult()
 {
-    delete Parser;
+    delete CodeParser;
 }
 
 ParserDiagnostic::ParserDiagnostic() {}

src/CppParser/CppParser.h

@@ -83,7 +83,7 @@ struct CS_API ParserResult
 
     CppSharp::CppParser::AST::ASTContext* ASTContext;
     CppSharp::CppParser::AST::NativeLibrary* Library;
-    Parser* Parser;
+    Parser* CodeParser;
 };
 
 enum class SourceLocationKind

src/CppParser/Parser.cpp

@@ -2948,8 +2948,8 @@ ParserResult* ClangParser::ParseHeader(ParserOptions* Opts)
         return nullptr;
 
     auto res = new ParserResult();
-    res->Parser = new Parser(Opts);
-    return res->Parser->ParseHeader(Opts->FileName, res);
+    res->CodeParser = new Parser(Opts);
+    return res->CodeParser->ParseHeader(Opts->FileName, res);
 }
 
 ParserResult* ClangParser::ParseLibrary(ParserOptions* Opts)
@@ -2958,8 +2958,8 @@ ParserResult* ClangParser::ParseLibrary(ParserOptions* Opts)
         return nullptr;
 
     auto res = new ParserResult();
-    res->Parser = new Parser(Opts);
-    return res->Parser->ParseLibrary(Opts->FileName, res);
+    res->CodeParser = new Parser(Opts);
+    return res->CodeParser->ParseLibrary(Opts->FileName, res);
 }
 
 ParserTargetInfo* ClangParser::GetTargetInfo(ParserOptions* Opts)