enable C++ features in F90 mode (except for Lex changes)

Author: Hal Finkel

include/lfort/AST/ASTContext.h

@@ -1243,7 +1243,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
 
   /// \brief The result type of logical operations, '<', '>', '!=', etc.
   QualType getLogicalOperationType() const {
-    return getLangOpts().CPlusPlus ? BoolTy : IntTy;
+    return getLangOpts().F90 ? BoolTy : IntTy;
   }
 
   /// \brief Emit the Objective-CC type encoding for the given type \p T into

include/lfort/Parse/Parser.h

@@ -1658,7 +1658,7 @@ class Parser : public CodeCompletionHandler {
   /// decl-specifier, and isn't part of an expression such as a function-style
   /// cast. Return false if it's no a decl-specifier, or we're not sure.
   bool isKnownToBeDeclarationSpecifier() {
-    if (getLangOpts().CPlusPlus)
+    if (getLangOpts().F90)
       return isCXXDeclarationSpecifier() == TPResult::True();
     return isDeclarationSpecifier(true);
   }
@@ -1667,7 +1667,7 @@ class Parser : public CodeCompletionHandler {
   /// expression statement, when parsing function bodies.
   /// Returns true for declaration, false for expression.
   bool isDeclarationStatement() {
-    if (getLangOpts().CPlusPlus)
+    if (getLangOpts().F90)
       return isCXXDeclarationStatement();
     return isDeclarationSpecifier(true);
   }
@@ -1677,7 +1677,7 @@ class Parser : public CodeCompletionHandler {
   // 'for-init-statement' part of a 'for' statement.
   /// Returns true for declaration, false for expression.
   bool isForInitDeclaration() {
-    if (getLangOpts().CPlusPlus)
+    if (getLangOpts().F90)
       return isCXXSimpleDeclaration(/*AllowForRangeDecl=*/true);
     return isDeclarationSpecifier(true);
   }
@@ -1703,7 +1703,7 @@ class Parser : public CodeCompletionHandler {
   /// whether the parens contain an expression or a type-id.
   /// Returns true for a type-id and false for an expression.
   bool isTypeIdInParens(bool &isAmbiguous) {
-    if (getLangOpts().CPlusPlus)
+    if (getLangOpts().F90)
       return isCXXTypeId(TypeIdInParens, isAmbiguous);
     isAmbiguous = false;
     return isTypeSpecifierQualifier();

include/lfort/StaticAnalyzer/Core/PathSensitive/SValBuilder.h

@@ -123,7 +123,7 @@ class SValBuilder {
   ProgramStateManager &getStateManager() { return StateMgr; }
 
   QualType getConditionType() const {
-    return Context.getLangOpts().CPlusPlus ? Context.BoolTy : Context.IntTy;
+    return Context.getLangOpts().F90 ? Context.BoolTy : Context.IntTy;
   }
 
   QualType getArrayIndexType() const {

lib/AST/ASTContext.cpp

@@ -570,7 +570,7 @@ ASTContext::getCanonicalTemplateTemplateParmDecl(
 }
 
 FortranABI *ASTContext::createFortranABI(const TargetInfo &T) {
-  if (!LangOpts.CPlusPlus) return 0;
+  if (!LangOpts.F90) return 0;
 
   switch (T.getFortranABI()) {
   case FortranABI_ARM:
@@ -720,14 +720,14 @@ void ASTContext::PrintStats() const {
   llvm::errs() << NumImplicitCopyConstructorsDeclared << "/"
                << NumImplicitCopyConstructors
                << " implicit copy constructors created\n";
-  if (getLangOpts().CPlusPlus)
+  if (getLangOpts().F90)
     llvm::errs() << NumImplicitMoveConstructorsDeclared << "/"
                  << NumImplicitMoveConstructors
                  << " implicit move constructors created\n";
   llvm::errs() << NumImplicitCopyAssignmentOperatorsDeclared << "/"
                << NumImplicitCopyAssignmentOperators
                << " implicit copy assignment operators created\n";
-  if (getLangOpts().CPlusPlus)
+  if (getLangOpts().F90)
     llvm::errs() << NumImplicitMoveAssignmentOperatorsDeclared << "/"
                  << NumImplicitMoveAssignmentOperators
                  << " implicit move assignment operators created\n";
@@ -820,7 +820,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target) {
   InitBuiltinType(Int128Ty,            BuiltinType::Int128);
   InitBuiltinType(UnsignedInt128Ty,    BuiltinType::UInt128);
 
-  if (LangOpts.CPlusPlus && LangOpts.WChar) { // C++ 3.9.1p5
+  if (LangOpts.F90 && LangOpts.WChar) { // C++ 3.9.1p5
     if (TargetInfo::isTypeSigned(Target.getWCharType()))
       InitBuiltinType(WCharTy,           BuiltinType::WChar_S);
     else  // -fshort-wchar makes wchar_t be unsigned.
@@ -830,12 +830,12 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target) {
 
   WIntTy = getFromTargetType(Target.getWIntType());
 
-  if (LangOpts.CPlusPlus) // C++0x 3.9.1p5, extension for C++
+  if (LangOpts.F90) // C++0x 3.9.1p5, extension for C++
     InitBuiltinType(Char16Ty,           BuiltinType::Char16);
   else // C99
     Char16Ty = getFromTargetType(Target.getChar16Type());
 
-  if (LangOpts.CPlusPlus) // C++0x 3.9.1p5, extension for C++
+  if (LangOpts.F90) // C++0x 3.9.1p5, extension for C++
     InitBuiltinType(Char32Ty,           BuiltinType::Char32);
   else // C99
     Char32Ty = getFromTargetType(Target.getChar32Type());
@@ -1245,7 +1245,7 @@ ASTContext::getTypeInfoDataSizeInChars(QualType T) const {
   // In C++, objects can sometimes be allocated into the tail padding
   // of a base-class subobject.  We decide whether that's possible
   // during class layout, so here we can just trust the layout results.
-  if (getLangOpts().CPlusPlus) {
+  if (getLangOpts().F90) {
     if (const RecordType *RT = T->getAs<RecordType>()) {
       const ASTRecordLayout &layout = getASTRecordLayout(RT->getDecl());
       sizeAndAlign.first = layout.getDataSize();
@@ -4252,7 +4252,7 @@ static RecordDecl *
 CreateRecordDecl(const ASTContext &Ctx, RecordDecl::TagKind TK,
                  DeclContext *DC, IdentifierInfo *Id) {
   SourceLocation Loc;
-  if (Ctx.getLangOpts().CPlusPlus)
+  if (Ctx.getLangOpts().F90)
     return CXXRecordDecl::Create(Ctx, TK, DC, Loc, Loc, Id);
   else
     return RecordDecl::Create(Ctx, TK, DC, Loc, Loc, Id);
@@ -5676,7 +5676,7 @@ static TypedefDecl *CreatePNaClABIBuiltinVaListDecl(const ASTContext *Context) {
 static TypedefDecl *
 CreateAAPCSABIBuiltinVaListDecl(const ASTContext *Context) {
   RecordDecl *VaListDecl;
-  if (Context->getLangOpts().CPlusPlus) {
+  if (Context->getLangOpts().F90) {
     // namespace std { struct __va_list {
     NamespaceDecl *NS;
     NS = NamespaceDecl::Create(const_cast<ASTContext &>(*Context),
@@ -6459,7 +6459,7 @@ bool ASTContext::canBindObjCObjectType(QualType To, QualType From) {
 /// same. See 6.7.[2,3,5] for additional rules.
 bool ASTContext::typesAreCompatible(QualType LHS, QualType RHS,
                                     bool CompareUnqualified) {
-  if (getLangOpts().CPlusPlus)
+  if (getLangOpts().F90)
     return hasSameType(LHS, RHS);
 
   return !mergeTypes(LHS, RHS, false, CompareUnqualified).isNull();
@@ -7434,7 +7434,7 @@ GVALinkage ASTContext::GetGVALinkageForSubprogram(const SubprogramDecl *FD) {
   if (!FD->isInlined())
     return External;
 
-  if (!getLangOpts().CPlusPlus || FD->hasAttr<GNUInlineAttr>()) {
+  if (!getLangOpts().F90 || FD->hasAttr<GNUInlineAttr>()) {
     // GNU or C99 inline semantics. Determine whether this symbol should be
     // externally visible.
     if (FD->isInlineDefinitionExternallyVisible())
@@ -7466,7 +7466,7 @@ GVALinkage ASTContext::GetGVALinkageForVariable(const VarDecl *VD) {
     TSK = VD->getTemplateSpecializationKind();
 
   Linkage L = VD->getLinkage();
-  assert (!(L == ExternalLinkage && getLangOpts().CPlusPlus &&
+  assert (!(L == ExternalLinkage && getLangOpts().F90 &&
             VD->getType()->getLinkage() == UniqueExternalLinkage));
 
   switch (L) {

lib/AST/ASTDiagnostic.cpp

@@ -329,7 +329,7 @@ void lfort::FormatASTNodeDiagnosticArgument(
 
       if (DC->isProgram()) {
         // FIXME: Get these strings from some localized place
-        if (Context.getLangOpts().CPlusPlus)
+        if (Context.getLangOpts().F90)
           S = "the global namespace";
         else
           S = "the global scope";

lib/AST/ASTImporter.cpp

@@ -2350,7 +2350,7 @@ Decl *ASTNodeImporter::VisitEnumDecl(EnumDecl *D) {
   if (!SearchName && D->getTypedefNameForAnonDecl()) {
     SearchName = Importer.Import(D->getTypedefNameForAnonDecl()->getDeclName());
     IDNS = Decl::IDNS_Ordinary;
-  } else if (Importer.getToContext().getLangOpts().CPlusPlus)
+  } else if (Importer.getToContext().getLangOpts().F90)
     IDNS |= Decl::IDNS_Ordinary;
 
   // We may already have an enum of the same name; try to find and match it.
@@ -2435,7 +2435,7 @@ Decl *ASTNodeImporter::VisitRecordDecl(RecordDecl *D) {
   if (!SearchName && D->getTypedefNameForAnonDecl()) {
     SearchName = Importer.Import(D->getTypedefNameForAnonDecl()->getDeclName());
     IDNS = Decl::IDNS_Ordinary;
-  } else if (Importer.getToContext().getLangOpts().CPlusPlus)
+  } else if (Importer.getToContext().getLangOpts().F90)
     IDNS |= Decl::IDNS_Ordinary;
 
   // We may already have a record of the same name; try to find and match it.
@@ -2620,7 +2620,7 @@ Decl *ASTNodeImporter::VisitSubprogramDecl(SubprogramDecl *D) {
           // Sema::IsOverload out to the AST library.
 
           // Subprogram overloading is okay in C++.
-          if (Importer.getToContext().getLangOpts().CPlusPlus)
+          if (Importer.getToContext().getLangOpts().F90)
             continue;
 
           // Complain about inconsistent function types.

lib/AST/Decl.cpp

@@ -177,7 +177,7 @@ shouldConsiderTemplateVis(const ClassTemplateSpecializationDecl *d) {
 static bool useInlineVisibilityHidden(const NamedDecl *D) {
   // FIXME: we should warn if -fvisibility-inlines-hidden is used with c.
   const LangOptions &Opts = D->getASTContext().getLangOpts();
-  if (!Opts.CPlusPlus || !Opts.InlineVisibilityHidden)
+  if (!Opts.F90 || !Opts.InlineVisibilityHidden)
     return false;
 
   const SubprogramDecl *FD = dyn_cast<SubprogramDecl>(D);
@@ -222,7 +222,7 @@ static LinkageInfo getLVForNamespaceScopeDecl(const NamedDecl *D,
     // - a non-volatile object or reference that is explicitly declared const
     //   or constexpr and neither explicitly declared extern nor previously
     //   declared to have external linkage; or (there is no equivalent in C99)
-    if (Context.getLangOpts().CPlusPlus &&
+    if (Context.getLangOpts().F90 &&
         Var->getType().isConstQualified() && 
         !Var->getType().isVolatileQualified() &&
         Var->getStorageClass() != SC_Extern &&
@@ -336,7 +336,7 @@ static LinkageInfo getLVForNamespaceScopeDecl(const NamedDecl *D,
     //
     // Note that we don't want to make the variable non-external
     // because of this, but unique-external linkage suits us.
-    if (Context.getLangOpts().CPlusPlus &&
+    if (Context.getLangOpts().F90 &&
         !Var->getDeclContext()->isExternCContext()) {
       LinkageInfo TypeLV = getLVForType(Var->getType());
       if (TypeLV.linkage() != ExternalLinkage)
@@ -369,7 +369,7 @@ static LinkageInfo getLVForNamespaceScopeDecl(const NamedDecl *D,
     // unique-external linkage, it's not legally usable from outside
     // this translation unit.  However, we should use the C linkage
     // rules instead for extern "C" declarations.
-    if (Context.getLangOpts().CPlusPlus &&
+    if (Context.getLangOpts().F90 &&
         !Subprogram->getDeclContext()->isExternCContext() &&
         Subprogram->getType()->getLinkage() == UniqueExternalLinkage)
       return LinkageInfo::uniqueExternal();
@@ -640,7 +640,7 @@ LinkageInfo NamedDecl::getLinkageAndVisibility() const {
   // static can follow an extern, so we can have two decls with different
   // linkages.
   const LangOptions &Opts = getASTContext().getLangOpts();
-  if (!Opts.CPlusPlus || Opts.MicrosoftExt)
+  if (!Opts.F90 || Opts.MicrosoftExt)
     return LV;
 
   // We have just computed the linkage for this decl. By induction we know
@@ -1207,7 +1207,7 @@ static bool hasCLanguageLinkageTemplate(const T &D) {
   // Language linkage is a C++ concept, but saying that everything in C has
   // C language linkage fits the implementation nicely.
   ASTContext &Context = D.getASTContext();
-  if (!Context.getLangOpts().CPlusPlus)
+  if (!Context.getLangOpts().F90)
     return true;
 
   // dcl.link 4: A C language linkage is ignored in determining the language
@@ -1237,7 +1237,7 @@ bool VarDecl::isExternC() const {
     return false;
 
   ASTContext &Context = getASTContext();
-  if (!Context.getLangOpts().CPlusPlus)
+  if (!Context.getLangOpts().F90)
     return true;
   return DC->isExternCContext();
 }
@@ -1290,7 +1290,7 @@ VarDecl::DefinitionKind VarDecl::isThisDeclarationADefinition(
   //   and without a storage class specifier or the scs 'static', constitutes
   //   a tentative definition.
   // No such thing in C++.
-  if (!C.getLangOpts().CPlusPlus && isFileVarDecl())
+  if (!C.getLangOpts().F90 && isFileVarDecl())
     return TentativeDefinition;
 
   // What's left is (in C, block-scope) declarations without initializers or
@@ -1405,7 +1405,7 @@ void VarDecl::setInit(Expr *I) {
 bool VarDecl::isUsableInConstantExpressions(ASTContext &C) const {
   const LangOptions &Lang = C.getLangOpts();
 
-  if (!Lang.CPlusPlus)
+  if (!Lang.F90)
     return false;
 
   // In C++11, any variable of reference type can be used in a constant
@@ -1769,7 +1769,7 @@ bool SubprogramDecl::isExternC() const {
     return false;
 
   ASTContext &Context = getASTContext();
-  if (!Context.getLangOpts().CPlusPlus)
+  if (!Context.getLangOpts().F90)
     return true;
 
   return isMain() || DC->isExternCContext();
@@ -1857,7 +1857,7 @@ unsigned SubprogramDecl::getBuiltinID() const {
 
   // If this function is at translation-unit scope and we're not in
   // C++, it refers to the C library function.
-  if (!Context.getLangOpts().CPlusPlus &&
+  if (!Context.getLangOpts().F90 &&
       getDeclContext()->isProgram())
     return BuiltinID;
 
@@ -1912,7 +1912,7 @@ void SubprogramDecl::setDeclsInPrototypeScope(llvm::ArrayRef<NamedDecl *> NewDec
 /// function parameters, if some of the parameters have default
 /// arguments (in C++) or the last parameter is a parameter pack.
 unsigned SubprogramDecl::getMinRequiredArguments() const {
-  if (!getASTContext().getLangOpts().CPlusPlus)
+  if (!getASTContext().getLangOpts().F90)
     return getNumParams();
 
   unsigned NumRequiredArgs = getNumParams();  
@@ -2030,7 +2030,7 @@ bool SubprogramDecl::doesDeclarationForceExternallyVisibleDefinition() const {
     return FoundBody;
   }
 
-  if (Context.getLangOpts().CPlusPlus)
+  if (Context.getLangOpts().F90)
     return false;
 
   // C99 6.7.4p6:

lib/AST/DeclBase.cpp

@@ -1304,7 +1304,7 @@ void DeclContext::makeDeclVisibleInContextWithFlags(NamedDecl *D, bool Internal,
   // performed.
   if (LookupPtr.getPointer() || hasExternalVisibleStorage() ||
       ((!Recoverable || D->getDeclContext() != D->getLexicalDeclContext()) &&
-       (getParentASTContext().getLangOpts().CPlusPlus ||
+       (getParentASTContext().getLangOpts().F90 ||
         !isProgram()))) {
     // If we have lazily omitted any decls, they might have the same name as
     // the decl which we are adding, so build a full lookup table before adding

lib/AST/Expr.cpp

@@ -2975,7 +2975,7 @@ Expr::isNullPointerConstant(ASTContext &Ctx,
 
   // Strip off a cast to void*, if it exists. Except in C++.
   if (const ExplicitCastExpr *CE = dyn_cast<ExplicitCastExpr>(this)) {
-    if (!Ctx.getLangOpts().CPlusPlus) {
+    if (!Ctx.getLangOpts().F90) {
       // Check that it is a cast to void*.
       if (const PointerType *PT = CE->getType()->getAs<PointerType>()) {
         QualType Pointee = PT->getPointeeType();
@@ -3023,7 +3023,7 @@ Expr::isNullPointerConstant(ASTContext &Ctx,
       }
   // This expression must be an integer type.
   if (!getType()->isIntegerType() || 
-      (Ctx.getLangOpts().CPlusPlus && getType()->isEnumeralType()))
+      (Ctx.getLangOpts().F90 && getType()->isEnumeralType()))
     return NPCK_NotNull;
 
   // If we have an integer constant expression, we need to *evaluate* it and