Refactor and format

Author: Huddie

lib/ClangImporter/ClangImporter.cpp

@@ -4122,32 +4122,15 @@ bool ClangImporter::Implementation::lookupValue(SwiftLookupTable &table,
   bool declFound = false;
 
   if (name.isOperator()) {
-      for (auto entry : table.lookupMemberOperators(name.getBaseName())) {
-          if (isVisibleClangEntry(entry)) {
-              if (auto decl = dyn_cast_or_null<ValueDecl>(
-                      importDeclReal(entry->getMostRecentDecl(), CurrentVersion))) {
-                  consumer.foundDecl(decl, DeclVisibilityKind::VisibleAtTopLevel);
-                  declFound = true;
-                  for (auto alternate : getAlternateDecls(decl)) {
-                      if (alternate->getName().matchesRef(name)) {
-                          consumer.foundDecl(alternate, DeclVisibilityKind::DynamicLookup,
-                                             DynamicLookupInfo::AnyObject);
-                      }
-                  }
-              }
-          }
-      }
 
-      // If CXXInterop is enabled we need to check the modified operator name as well
-      if(SwiftContext.LangOpts.EnableCXXInterop) {
-          auto declBaseName = DeclBaseName(SwiftContext.getIdentifier("__operator" + getOperatorNameForToken(name.getBaseName().getIdentifier().str().str())));
+      auto findAndConsumeBaseNameFromTable = [this, &table, &consumer, &declFound, &name](DeclBaseName declBaseName) {
           for (auto entry : table.lookupMemberOperators(declBaseName)) {
               if (isVisibleClangEntry(entry)) {
                   if (auto decl = dyn_cast_or_null<ValueDecl>(
                           importDeclReal(entry->getMostRecentDecl(), CurrentVersion))) {
                       consumer.foundDecl(decl, DeclVisibilityKind::VisibleAtTopLevel);
                       declFound = true;
-                      for (auto alternate: getAlternateDecls(decl)) {
+                      for (auto alternate : getAlternateDecls(decl)) {
                           if (alternate->getName().matchesRef(name)) {
                               consumer.foundDecl(alternate, DeclVisibilityKind::DynamicLookup,
                                                  DynamicLookupInfo::AnyObject);
@@ -4156,6 +4139,15 @@ bool ClangImporter::Implementation::lookupValue(SwiftLookupTable &table,
                   }
               }
           }
+      };
+
+      findAndConsumeBaseNameFromTable(name.getBaseName());
+
+      // If CXXInterop is enabled we need to check the modified operator name as well
+      if(SwiftContext.LangOpts.EnableCXXInterop) {
+          auto declBaseName = DeclBaseName(SwiftContext.getIdentifier(
+                  "__operator" + getOperatorNameForToken(name.getBaseName().getIdentifier().str().str())));
+          findAndConsumeBaseNameFromTable(declBaseName);
       }
   }
 

lib/ClangImporter/ImportDecl.cpp

@@ -4298,11 +4298,6 @@ namespace {
             templateParams);
 
         if (auto *mdecl = dyn_cast<clang::CXXMethodDecl>(decl)) {
-          // Subscripts and call operators are imported as normal methods.
-          // bool staticOperator = mdecl->isOverloadedOperator();
-          bool requiresStaticTopLevel =
-                                mdecl->getOverloadedOperator() != clang::OO_Call &&
-                                mdecl->getOverloadedOperator() != clang::OO_Subscript;
           if (mdecl->isStatic()) {
             selfIdx = None;
           } else {
@@ -8154,7 +8149,6 @@ synthesizeOperatorMethodBody(AbstractFunctionDecl *afd, void *context) {
 FuncDecl *SwiftDeclConverter::makeOperator(FuncDecl *operatorMethod, clang::CXXMethodDecl *clangOperator) {
   auto &ctx = Impl.SwiftContext;
   auto opName = clang::getOperatorSpelling(clangOperator->getOverloadedOperator());
-  auto loc = operatorMethod->getLoc();
   auto paramList = operatorMethod->getParameters();
   auto genericParamList = operatorMethod->getGenericParams();
 
@@ -8182,8 +8176,6 @@ FuncDecl *SwiftDeclConverter::makeOperator(FuncDecl *operatorMethod, clang::CXXM
       newParams.push_back(param);
   }
 
-  auto newParamList = ParameterList::create(ctx, newParams);
-
   auto oldArgNames = operatorMethod->getName().getArgumentNames();
   SmallVector<Identifier, 4> newArgNames;
   newArgNames.push_back(Identifier());