[libSyntax] Make a typealias to unsigned to represent SyntaxNodeIds

ahoppen · ahoppen · commit c8226d1507ee · 2018-07-19T13:57:08.000-07:00
diff --git a/include/swift/Parse/SyntaxParsingCache.h b/include/swift/Parse/SyntaxParsingCache.h
@@ -62,7 +62,7 @@ class SyntaxParsingCache {
   llvm::SmallVector<SourceEdit, 4> Edits;
 
   /// The IDs of all syntax nodes that got reused are collected in this vector.
-  std::unordered_set<unsigned> ReusedNodeIds;
+  std::unordered_set<SyntaxNodeId> ReusedNodeIds;
 
 public:
   SyntaxParsingCache(SourceFileSyntax OldSyntaxTree)
@@ -80,7 +80,7 @@ class SyntaxParsingCache {
   /// reused for a new syntax tree.
   llvm::Optional<Syntax> lookUp(size_t NewPosition, SyntaxKind Kind);
 
-  const std::unordered_set<unsigned> &getReusedNodeIds() const {
+  const std::unordered_set<SyntaxNodeId> &getReusedNodeIds() const {
     return ReusedNodeIds;
   }
 
diff --git a/include/swift/Syntax/RawSyntax.h b/include/swift/Syntax/RawSyntax.h
@@ -212,6 +212,8 @@ struct SyntaxPrintOptions {
   bool PrintTrivialNodeKind = false;
 };
 
+typedef unsigned SyntaxNodeId;
+
 /// RawSyntax - the strictly immutable, shared backing nodes for all syntax.
 ///
 /// This is implementation detail - do not expose it in public API.
@@ -223,10 +225,10 @@ class RawSyntax final
 
   /// The ID that shall be used for the next node that is created and does not
   /// have a manually specified id
-  static unsigned NextFreeNodeId;
+  static SyntaxNodeId NextFreeNodeId;
 
   /// An ID of this node that is stable across incremental parses
-  unsigned NodeId;
+  SyntaxNodeId NodeId;
 
   union {
     uint64_t OpaqueBits;
@@ -283,13 +285,13 @@ class RawSyntax final
   /// the caller needs to assure that the node ID has not been used yet.
   RawSyntax(SyntaxKind Kind, ArrayRef<RC<RawSyntax>> Layout,
             SourcePresence Presence, bool ManualMemory,
-            llvm::Optional<unsigned> NodeId);
+            llvm::Optional<SyntaxNodeId> NodeId);
   /// Constructor for creating token nodes
   /// If \p NodeId is \c None, the next free NodeId is used, if it is passed,
   /// the caller needs to assure that the NodeId has not been used yet.
   RawSyntax(tok TokKind, OwnedString Text, ArrayRef<TriviaPiece> LeadingTrivia,
             ArrayRef<TriviaPiece> TrailingTrivia, SourcePresence Presence,
-            bool ManualMemory, llvm::Optional<unsigned> NodeId);
+            bool ManualMemory, llvm::Optional<SyntaxNodeId> NodeId);
 
 public:
   ~RawSyntax();
@@ -312,15 +314,15 @@ class RawSyntax final
   static RC<RawSyntax> make(SyntaxKind Kind, ArrayRef<RC<RawSyntax>> Layout,
                             SourcePresence Presence,
                             SyntaxArena *Arena = nullptr,
-                            llvm::Optional<unsigned> NodeId = llvm::None);
+                            llvm::Optional<SyntaxNodeId> NodeId = llvm::None);
 
   /// Make a raw "token" syntax node.
   static RC<RawSyntax> make(tok TokKind, OwnedString Text,
                             ArrayRef<TriviaPiece> LeadingTrivia,
                             ArrayRef<TriviaPiece> TrailingTrivia,
                             SourcePresence Presence,
                             SyntaxArena *Arena = nullptr,
-                            llvm::Optional<unsigned> NodeId = llvm::None);
+                            llvm::Optional<SyntaxNodeId> NodeId = llvm::None);
 
   /// Make a missing raw "layout" syntax node.
   static RC<RawSyntax> missing(SyntaxKind Kind, SyntaxArena *Arena = nullptr) {
@@ -349,7 +351,7 @@ class RawSyntax final
   }
 
   /// Get an ID for this node that is stable across incremental parses
-  unsigned getId() const { return NodeId; }
+  SyntaxNodeId getId() const { return NodeId; }
 
   /// Returns true if the node is "missing" in the source (i.e. it was
   /// expected (or optional) but not written.
diff --git a/include/swift/Syntax/Syntax.h b/include/swift/Syntax/Syntax.h
@@ -85,7 +85,7 @@ class Syntax {
   RC<RawSyntax> getRaw() const;
 
   /// Get an ID for this node that is stable across incremental parses
-  unsigned getId() const { return getRaw()->getId(); }
+  SyntaxNodeId getId() const { return getRaw()->getId(); }
 
   /// Get the number of child nodes in this piece of syntax, not including
   /// tokens.
diff --git a/include/swift/Syntax/SyntaxClassifier.h.gyb b/include/swift/Syntax/SyntaxClassifier.h.gyb
@@ -69,7 +69,7 @@ class SyntaxClassifier: public SyntaxVisitor {
         ForceClassification(ForceClassification) {}
   };
 
-  std::map<unsigned, SyntaxClassification> ClassifiedTokens;
+  std::map<SyntaxNodeId, SyntaxClassification> ClassifiedTokens;
   /// The top classification of this stack determines the color of identifiers
   std::stack<ContextStackEntry, llvm::SmallVector<ContextStackEntry, 16>> ContextStack;
 
@@ -101,7 +101,7 @@ class SyntaxClassifier: public SyntaxVisitor {
 % end
 
 public:
-  std::map<unsigned, SyntaxClassification> classify(Syntax Node) {
+  std::map<SyntaxNodeId, SyntaxClassification> classify(Syntax Node) {
     // Clean up the environment
     ContextStack = std::stack<ContextStackEntry, llvm::SmallVector<ContextStackEntry, 16>>();
     ContextStack.push({SyntaxClassification::None, false});
diff --git a/lib/Parse/SyntaxParsingCache.cpp b/lib/Parse/SyntaxParsingCache.cpp
@@ -94,15 +94,15 @@ std::vector<SyntaxReuseRegion>
 SyntaxParsingCache::getReusedRegions(const SourceFileSyntax &SyntaxTree) const {
   /// Determines the reused source regions from reused syntax node IDs
   class ReusedRegionsCollector : public SyntaxVisitor {
-    std::unordered_set<unsigned> ReusedNodeIds;
+    std::unordered_set<SyntaxNodeId> ReusedNodeIds;
     std::vector<SyntaxReuseRegion> ReusedRegions;
 
-    bool didReuseNode(unsigned NodeId) {
+    bool didReuseNode(SyntaxNodeId NodeId) {
       return ReusedNodeIds.count(NodeId) > 0;
     }
 
   public:
-    ReusedRegionsCollector(std::unordered_set<unsigned> ReusedNodeIds)
+    ReusedRegionsCollector(std::unordered_set<SyntaxNodeId> ReusedNodeIds)
         : ReusedNodeIds(ReusedNodeIds) {}
 
     const std::vector<SyntaxReuseRegion> &getReusedRegions() {
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp b/tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
@@ -562,12 +562,12 @@ struct SwiftSyntaxMap {
 class SyntaxToSyntaxMapConverter : public SyntaxVisitor {
   SwiftSyntaxMap &SyntaxMap;
 
-  std::map<unsigned, SyntaxClassification> TokenClassifications;
+  std::map<SyntaxNodeId, SyntaxClassification> TokenClassifications;
 
 public:
   SyntaxToSyntaxMapConverter(
       SwiftSyntaxMap &SyntaxMap,
-      std::map<unsigned, SyntaxClassification> TokenClassifications)
+      std::map<SyntaxNodeId, SyntaxClassification> TokenClassifications)
       : SyntaxMap(SyntaxMap), TokenClassifications(TokenClassifications) {}
 
 private:
diff --git a/tools/swift-ide-test/swift-ide-test.cpp b/tools/swift-ide-test/swift-ide-test.cpp
@@ -960,7 +960,7 @@ class PrintSyntaxColorWalker : public ide::SyntaxModelWalker {
 class ColoredSyntaxTreePrinter : public SyntaxVisitor {
   llvm::raw_ostream &OS;
 
-  std::map<unsigned, SyntaxClassification> TokenClassifications;
+  std::map<SyntaxNodeId, SyntaxClassification> TokenClassifications;
 
   /// The name of the tag that is currently open
   StringRef CurrentTag;
@@ -972,7 +972,7 @@ class ColoredSyntaxTreePrinter : public SyntaxVisitor {
 public:
   ColoredSyntaxTreePrinter(
       llvm::raw_ostream &OS,
-      std::map<unsigned, SyntaxClassification> TokenClassifications)
+      std::map<SyntaxNodeId, SyntaxClassification> TokenClassifications)
       : OS(OS), TokenClassifications(TokenClassifications) {}
 
 private:
