Merge pull request #255 from tomba/fix-warnings

Fix trivial warnings

src/CppParser/Parser.cpp

@@ -83,9 +83,9 @@ static std::string GetCXXABIString(clang::TargetCXXABI::Kind Kind)
         return "itanium";
     case clang::TargetCXXABI::Microsoft:
         return "microsoft";
+    default:
+        llvm_unreachable("Unknown C++ ABI kind");
     }
-
-    llvm_unreachable("Unknown C++ ABI kind");
 }
 
 #ifdef _MSC_VER
@@ -418,9 +418,11 @@ static AccessSpecifier ConvertToAccess(clang::AccessSpecifier AS)
         return AccessSpecifier::Protected;
     case clang::AS_public:
         return AccessSpecifier::Public;
+    case clang::AS_none:
+        return AccessSpecifier::Public;
     }
 
-    return AccessSpecifier::Public;
+    llvm_unreachable("Unknown AccessSpecifier");
 }
 
 VTableComponent
@@ -973,6 +975,9 @@ Parser::WalkTemplateArgument(const clang::TemplateArgument& TA, clang::TemplateA
     case clang::TemplateArgument::Pack:
         Arg.Kind = CppSharp::CppParser::TemplateArgument::ArgumentKind::Pack;
         break;
+    case clang::TemplateArgument::Null:
+    default:
+        llvm_unreachable("Unknown TemplateArgument");
     }
 
     return Arg;
@@ -1068,12 +1073,17 @@ static CXXOperatorKind GetOperatorKindFromDecl(clang::DeclarationName Name)
 
     switch(Name.getCXXOverloadedOperator())
     {
+    case OO_None:
+        return CXXOperatorKind::None;
+    case NUM_OVERLOADED_OPERATORS:
+        break;
+
     #define OVERLOADED_OPERATOR(Name,Spelling,Token,Unary,Binary,MemberOnly) \
     case OO_##Name: return CXXOperatorKind::Name;
     #include "clang/Basic/OperatorKinds.def"
     }
 
-    return CXXOperatorKind::None;
+    llvm_unreachable("Unknown OverloadedOperator");
 }
 
 Method* Parser::WalkMethodCXX(clang::CXXMethodDecl* MD, bool AddToClass)
@@ -1388,13 +1398,9 @@ static CallingConvention ConvertCallConv(clang::CallingConv CC)
         return CallingConvention::FastCall;
     case CC_X86ThisCall:
         return CallingConvention::ThisCall;
-    case CC_X86Pascal:
-    case CC_AAPCS:
-    case CC_AAPCS_VFP:
+    default:
         return CallingConvention::Unknown;
     }
-
-    return CallingConvention::Default;
 }
 
 static ParserIntType ConvertIntType(clang::TargetInfo::IntType IT)
@@ -2311,6 +2317,11 @@ PreprocessedEntity* Parser::WalkPreprocessedEntity(
         Definition->Name = II->getName().trim();
         Definition->Expression = Expression.trim();
     }
+    case clang::PreprocessedEntity::InclusionDirectiveKind:
+        // nothing to be done for InclusionDirectiveKind
+        break;
+    default:
+        llvm_unreachable("Unknown PreprocessedEntity");
     }
 
     if (!Entity)

src/Parser/Parser.cpp

@@ -82,9 +82,9 @@ static std::string GetCXXABIString(clang::TargetCXXABI::Kind Kind)
         return "itanium";
     case clang::TargetCXXABI::Microsoft:
         return "microsoft";
+    default:
+        llvm_unreachable("Unknown C++ ABI kind");
     }
-
-    llvm_unreachable("Unknown C++ ABI kind");
 }
 
 #ifdef _MSC_VER
@@ -411,9 +411,11 @@ static CppSharp::AST::AccessSpecifier ConvertToAccess(clang::AccessSpecifier AS)
         return CppSharp::AST::AccessSpecifier::Protected;
     case clang::AS_public:
         return CppSharp::AST::AccessSpecifier::Public;
+    case clang::AS_none:
+        return CppSharp::AST::AccessSpecifier::Public;
     }
 
-    return CppSharp::AST::AccessSpecifier::Public;
+    llvm_unreachable("Unknown AccessSpecifier");
 }
 
 CppSharp::AST::VTableComponent
@@ -979,6 +981,9 @@ Parser::WalkTemplateArgument(const clang::TemplateArgument& TA, clang::TemplateA
     case TemplateArgument::Pack:
         Arg.Kind = CppSharp::AST::TemplateArgument::ArgumentKind::Pack;
         break;
+    case TemplateArgument::Null:
+    default:
+        llvm_unreachable("Unknown TemplateArgument");
     }
 
     return Arg;
@@ -1077,12 +1082,17 @@ static CppSharp::AST::CXXOperatorKind GetOperatorKindFromDecl(clang::Declaration
 
     switch(Name.getCXXOverloadedOperator())
     {
+    case OO_None:
+        return CppSharp::AST::CXXOperatorKind::None;
+    case NUM_OVERLOADED_OPERATORS:
+        break;
+
     #define OVERLOADED_OPERATOR(Name,Spelling,Token,Unary,Binary,MemberOnly) \
     case OO_##Name: return CppSharp::AST::CXXOperatorKind::Name;
     #include "clang/Basic/OperatorKinds.def"
     }
 
-    return CppSharp::AST::CXXOperatorKind::None;
+    llvm_unreachable("Unknown OverloadedOperator");
 }
 
 CppSharp::AST::Method^ Parser::WalkMethodCXX(clang::CXXMethodDecl* MD, bool AddToClass)
@@ -1395,13 +1405,9 @@ static CppSharp::AST::CallingConvention ConvertCallConv(clang::CallingConv CC)
         return CppSharp::AST::CallingConvention::FastCall;
     case CC_X86ThisCall:
         return CppSharp::AST::CallingConvention::ThisCall;
-    case CC_X86Pascal:
-    case CC_AAPCS:
-    case CC_AAPCS_VFP:
+    default:
         return CppSharp::AST::CallingConvention::Unknown;
     }
-
-    return CppSharp::AST::CallingConvention::Default;
 }
 
 static ParserIntType ConvertIntType(clang::TargetInfo::IntType IT)
@@ -2319,6 +2325,11 @@ CppSharp::AST::PreprocessedEntity^ Parser::WalkPreprocessedEntity(
         Definition->Name = clix::marshalString<clix::E_UTF8>(II->getName())->Trim();
         Definition->Expression = clix::marshalString<clix::E_UTF8>(Expression)->Trim();
     }
+    case clang::PreprocessedEntity::InclusionDirectiveKind:
+        // nothing to be done for InclusionDirectiveKind
+        break;
+    default:
+        llvm_unreachable("Unknown PreprocessedEntity");
     }
 
     if (!Entity)

tests/Basic/Basic.cpp

@@ -229,5 +229,5 @@ int test(basic& s)
 
 Bar::Item operator |(Bar::Item left, Bar::Item right)
 {
-    return left | right;
+    return left;
 }