Stop passing around these flags as an unsigned.

rjmccall · rjmccall · commit 8f44e70b21ab · 2016-05-17T15:26:26.000-07:00
diff --git a/include/swift/AST/DeclContext.h b/include/swift/AST/DeclContext.h
@@ -20,6 +20,7 @@
 #define SWIFT_DECLCONTEXT_H
 
 #include "swift/AST/Identifier.h"
+#include "swift/AST/LookupKinds.h"
 #include "swift/AST/ResilienceExpansion.h"
 #include "swift/AST/TypeAlignments.h"
 #include "swift/Basic/LLVM.h"
@@ -413,7 +414,7 @@ class alignas(1 << DeclContextAlignInBits) DeclContext {
   /// lookup.
   ///
   /// \returns true if anything was found.
-  bool lookupQualified(Type type, DeclName member, unsigned options,
+  bool lookupQualified(Type type, DeclName member, NLOptions options,
                        LazyResolver *typeResolver,
                        SmallVectorImpl<ValueDecl *> &decls) const;
 
diff --git a/include/swift/AST/LookupKinds.h b/include/swift/AST/LookupKinds.h
@@ -0,0 +1,112 @@
+//===--- LookupKinds.h - Swift name-lookup enums ----------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines enums relating to name lookup.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_LOOKUPKINDS_H
+#define SWIFT_LOOKUPKINDS_H
+
+namespace swift {
+
+/// NLKind - This is a specifier for the kind of name lookup being performed
+/// by various query methods.
+enum class NLKind {
+  UnqualifiedLookup,
+  QualifiedLookup
+};
+
+/// Constants used to customize name lookup.
+enum NLOptions : unsigned {
+  /// Visit supertypes (such as superclasses or inherited protocols)
+  /// and their extensions as well as the current extension.
+  NL_VisitSupertypes = 0x01,
+
+  /// Consider declarations within protocols to which the context type conforms.
+  NL_ProtocolMembers = 0x02,
+
+  /// Remove non-visible declarations from the set of results.
+  NL_RemoveNonVisible = 0x04,
+
+  /// Remove overridden declarations from the set of results.
+  NL_RemoveOverridden = 0x08,
+
+  /// For existentials involving the special \c AnyObject protocol,
+  /// allow lookups to find members of all classes.
+  NL_DynamicLookup = 0x10,
+
+  /// Don't check accessibility when doing lookup into a type.
+  ///
+  /// This option is not valid when performing lookup into a module.
+  NL_IgnoreAccessibility = 0x20,
+
+  /// This lookup is known to be a non-cascading dependency, i.e. one that does
+  /// not affect downstream files.
+  ///
+  /// \see NL_KnownDependencyMask
+  NL_KnownNonCascadingDependency = 0x40,
+
+  /// This lookup is known to be a cascading dependency, i.e. one that can
+  /// affect downstream files.
+  ///
+  /// \see NL_KnownDependencyMask
+  NL_KnownCascadingDependency = 0x80,
+
+  /// This lookup is known to not add any additional dependencies to the
+  /// primary source file.
+  ///
+  /// \see NL_KnownDependencyMask
+  NL_KnownNoDependency =
+      NL_KnownNonCascadingDependency|NL_KnownCascadingDependency,
+
+  /// A mask of all options controlling how a lookup should be recorded as a
+  /// dependency.
+  ///
+  /// This offers three possible options: NL_KnownNonCascadingDependency,
+  /// NL_KnownCascadingDependency, NL_KnownNoDependency, as well as a default
+  /// "unspecified" value (0). If the dependency kind is unspecified, the
+  /// lookup function will attempt to infer whether it is a cascading or
+  /// non-cascading dependency from the decl context.
+  NL_KnownDependencyMask = NL_KnownNoDependency,
+
+  /// The default set of options used for qualified name lookup.
+  ///
+  /// FIXME: Eventually, add NL_ProtocolMembers to this, once all of the
+  /// callers can handle it.
+  NL_QualifiedDefault = NL_VisitSupertypes | NL_RemoveNonVisible |
+                        NL_RemoveOverridden,
+
+  /// The default set of options used for unqualified name lookup.
+  NL_UnqualifiedDefault = NL_VisitSupertypes |
+                          NL_RemoveNonVisible | NL_RemoveOverridden
+};
+
+static inline NLOptions operator|(NLOptions lhs, NLOptions rhs) {
+  return NLOptions(unsigned(lhs) | unsigned(rhs));
+}
+static inline NLOptions &operator|=(NLOptions &lhs, NLOptions rhs) {
+  return (lhs = lhs | rhs);
+}
+static inline NLOptions operator&(NLOptions lhs, NLOptions rhs) {
+  return NLOptions(unsigned(lhs) & unsigned(rhs));
+}
+static inline NLOptions &operator&=(NLOptions &lhs, NLOptions rhs) {
+  return (lhs = lhs & rhs);
+}
+static inline NLOptions operator~(NLOptions value) {
+  return NLOptions(~(unsigned)value);
+}
+
+} // end namespace swift
+
+#endif
diff --git a/include/swift/AST/Module.h b/include/swift/AST/Module.h
@@ -20,6 +20,7 @@
 #include "swift/AST/Decl.h"
 #include "swift/AST/DeclContext.h"
 #include "swift/AST/Identifier.h"
+#include "swift/AST/LookupKinds.h"
 #include "swift/AST/RawComment.h"
 #include "swift/AST/Type.h"
 #include "swift/Basic/OptionSet.h"
@@ -76,78 +77,6 @@ namespace swift {
   class VarDecl;
   class VisibleDeclConsumer;
   
-  /// NLKind - This is a specifier for the kind of name lookup being performed
-  /// by various query methods.
-  enum class NLKind {
-    UnqualifiedLookup,
-    QualifiedLookup
-  };
-
-/// Constants used to customize name lookup.
-enum ASTNameLookupFlags {
-  /// Visit supertypes (such as superclasses or inherited protocols)
-  /// and their extensions as well as the current extension.
-  NL_VisitSupertypes = 0x01,
-
-  /// Consider declarations within protocols to which the context type conforms.
-  NL_ProtocolMembers = 0x02,
-
-  /// Remove non-visible declarations from the set of results.
-  NL_RemoveNonVisible = 0x04,
-
-  /// Remove overridden declarations from the set of results.
-  NL_RemoveOverridden = 0x08,
-
-  /// For existentials involving the special \c AnyObject protocol,
-  /// allow lookups to find members of all classes.
-  NL_DynamicLookup = 0x10,
-
-  /// Don't check accessibility when doing lookup into a type.
-  ///
-  /// This option is not valid when performing lookup into a module.
-  NL_IgnoreAccessibility = 0x20,
-
-  /// This lookup is known to be a non-cascading dependency, i.e. one that does
-  /// not affect downstream files.
-  ///
-  /// \see NL_KnownDependencyMask
-  NL_KnownNonCascadingDependency = 0x40,
-
-  /// This lookup is known to be a cascading dependency, i.e. one that can
-  /// affect downstream files.
-  ///
-  /// \see NL_KnownDependencyMask
-  NL_KnownCascadingDependency = 0x80,
-
-  /// This lookup is known to not add any additional dependencies to the
-  /// primary source file.
-  ///
-  /// \see NL_KnownDependencyMask
-  NL_KnownNoDependency =
-      NL_KnownNonCascadingDependency|NL_KnownCascadingDependency,
-
-  /// A mask of all options controlling how a lookup should be recorded as a
-  /// dependency.
-  ///
-  /// This offers three possible options: NL_KnownNonCascadingDependency,
-  /// NL_KnownCascadingDependency, NL_KnownNoDependency, as well as a default
-  /// "unspecified" value (0). If the dependency kind is unspecified, the
-  /// lookup function will attempt to infer whether it is a cascading or
-  /// non-cascading dependency from the decl context.
-  NL_KnownDependencyMask = NL_KnownNoDependency,
-
-  /// The default set of options used for qualified name lookup.
-  ///
-  /// FIXME: Eventually, add NL_ProtocolMembers to this, once all of the
-  /// callers can handle it.
-  NL_QualifiedDefault = NL_VisitSupertypes | NL_RemoveNonVisible |
-                        NL_RemoveOverridden,
-
-  /// The default set of options used for unqualified name lookup.
-  NL_UnqualifiedDefault = NL_VisitSupertypes |
-                          NL_RemoveNonVisible | NL_RemoveOverridden
-};
-
 /// Discriminator for file-units.
 enum class FileUnitKind {
   /// For a .swift source file.
diff --git a/lib/AST/NameLookup.cpp b/lib/AST/NameLookup.cpp
@@ -520,7 +520,7 @@ UnqualifiedLookup::UnqualifiedLookup(DeclName Name, DeclContext *DC,
         if (TypeResolver)
           TypeResolver->resolveDeclSignature(BaseDecl);
 
-        unsigned options = NL_UnqualifiedDefault;
+        NLOptions options = NL_UnqualifiedDefault;
         if (isCascadingUse.getValue())
           options |= NL_KnownCascadingDependency;
         else
@@ -1024,7 +1024,7 @@ bool AbstractStorageDecl::isSetterAccessibleFrom(const DeclContext *DC) const {
 
 bool DeclContext::lookupQualified(Type type,
                                   DeclName member,
-                                  unsigned options,
+                                  NLOptions options,
                                   LazyResolver *typeResolver,
                                   SmallVectorImpl<ValueDecl *> &decls) const {
   using namespace namelookup;
diff --git a/lib/IDE/ReconstructType.cpp b/lib/IDE/ReconstructType.cpp
@@ -151,7 +151,7 @@ class DeclsLookupSource {
     decltype(m_decls)::const_iterator end() { return m_decls.end(); }
   };
 
-  bool lookupQualified(ModuleDecl *entry, Identifier name, unsigned options,
+  bool lookupQualified(ModuleDecl *entry, Identifier name, NLOptions options,
                        LazyResolver *typeResolver, ValueDecls &decls) {
     if (!entry)
       return false;
@@ -209,7 +209,7 @@ class DeclsLookupSource {
     return DeclsLookupSource(source._module, decl);
   }
 
-  void lookupQualified(Identifier name, unsigned options,
+  void lookupQualified(Identifier name, NLOptions options,
                        LazyResolver *typeResolver, ValueDecls &result) {
     if (_type == LookupKind::Crawler) {
       ASTContext *ast_ctx = _crawler._ast;
@@ -576,7 +576,7 @@ static bool FindFirstNamedDeclWithKind(
           name_ident, ast->getIdentifier(priv_decl_id.getValue().c_str()),
           decls);
     else
-      result._module.lookupQualified(name_ident, 0, NULL, decls);
+      result._module.lookupQualified(name_ident, NLOptions(), NULL, decls);
     if (!decls.empty()) {
       bool check_type_aliases = false;
       // Look for an exact match first
diff --git a/lib/Parse/ParseSIL.cpp b/lib/Parse/ParseSIL.cpp
@@ -769,7 +769,7 @@ static ValueDecl *lookupMember(Parser &P, Type Ty, Identifier Name,
                                SourceLoc Loc,
                                SmallVectorImpl<ValueDecl *> &Lookup,
                                bool ExpectMultipleResults) {
-  unsigned options = NL_QualifiedDefault;
+  NLOptions options = NL_QualifiedDefault;
   // FIXME: a bit of a hack.
   if (Name == P.Context.Id_deinit || Name == P.Context.Id_init)
     options = options & ~NL_VisitSupertypes;
diff --git a/lib/Sema/TypeCheckNameLookup.cpp b/lib/Sema/TypeCheckNameLookup.cpp
@@ -237,7 +237,7 @@ LookupResult TypeChecker::lookupMember(DeclContext *dc,
                                        Type type, DeclName name,
                                        NameLookupOptions options) {
   LookupResult result;
-  unsigned subOptions = NL_QualifiedDefault;
+  NLOptions subOptions = NL_QualifiedDefault;
   if (options.contains(NameLookupFlags::KnownPrivate))
     subOptions |= NL_KnownNonCascadingDependency;
   if (options.contains(NameLookupFlags::DynamicLookup))
@@ -326,7 +326,7 @@ LookupTypeResult TypeChecker::lookupMemberType(DeclContext *dc,
          
   // Look for members with the given name.
   SmallVector<ValueDecl *, 4> decls;
-  unsigned subOptions = NL_QualifiedDefault;
+  NLOptions subOptions = NL_QualifiedDefault;
   if (options.contains(NameLookupFlags::KnownPrivate))
     subOptions |= NL_KnownNonCascadingDependency;
   if (options.contains(NameLookupFlags::ProtocolMembers))
diff --git a/lib/Sema/TypeCheckPattern.cpp b/lib/Sema/TypeCheckPattern.cpp
@@ -1575,7 +1575,7 @@ bool TypeChecker::coercePatternToType(Pattern *&P, DeclContext *dc, Type type,
           continue;
         VarDecl *prop = nullptr;
         SmallVector<ValueDecl *, 4> members;
-        unsigned lookupOptions =
+        NLOptions lookupOptions =
             NL_QualifiedDefault | NL_KnownNonCascadingDependency;
         if (!dc->lookupQualified(type, elt.getPropertyName(),
                                  lookupOptions, this, members)) {
