Rename ASDN C++ namespace to AS

Source/ASCollectionNode.mm

@@ -106,7 +106,7 @@ - (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMo
 
 @interface ASCollectionNode ()
 {
-  ASDN::RecursiveMutex _environmentStateLock;
+  AS::RecursiveMutex _environmentStateLock;
   Class _collectionViewClass;
   id<ASBatchFetchingDelegate> _batchFetchingDelegate;
 }

Source/ASDisplayNode+Layout.mm

@@ -21,6 +21,8 @@
 #import <AsyncDisplayKit/ASDisplayNode+Yoga.h>
 #import <AsyncDisplayKit/NSArray+Diffing.h>
 
+using AS::MutexLocker;
+
 @interface ASDisplayNode (ASLayoutElementStyleDelegate) <ASLayoutElementStyleDelegate>
 @end
 
@@ -42,7 +44,7 @@ @implementation ASDisplayNode (ASLayoutElement)
 
 - (BOOL)implementsLayoutMethod
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   return (_methodOverrides & (ASDisplayNodeMethodOverrideLayoutSpecThatFits |
                               ASDisplayNodeMethodOverrideCalcLayoutThatFits |
                               ASDisplayNodeMethodOverrideCalcSizeThatFits)) != 0 || _layoutSpecBlock != nil;
@@ -51,7 +53,7 @@ - (BOOL)implementsLayoutMethod
 
 - (ASLayoutElementStyle *)style
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   return [self _locked_style];
 }
 
@@ -165,7 +167,7 @@ @implementation ASDisplayNode (ASLayout)
 - (ASLayoutEngineType)layoutEngineType
 {
 #if YOGA
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   YGNodeRef yogaNode = _style.yogaNode;
   BOOL hasYogaParent = (_yogaParent != nil);
   BOOL hasYogaChildren = (_yogaChildren.count > 0);
@@ -179,13 +181,13 @@ - (ASLayoutEngineType)layoutEngineType
 
 - (ASLayout *)calculatedLayout
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   return _calculatedDisplayNodeLayout.layout;
 }
 
 - (CGSize)calculatedSize
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   if (_pendingDisplayNodeLayout.isValid(_layoutVersion)) {
     return _pendingDisplayNodeLayout.layout.size;
   }
@@ -194,7 +196,7 @@ - (CGSize)calculatedSize
 
 - (ASSizeRange)constrainedSizeForCalculatedLayout
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   return [self _locked_constrainedSizeForCalculatedLayout];
 }
 
@@ -447,7 +449,7 @@ - (void)_u_measureNodeWithBoundsIfNecessary:(CGRect)bounds
 
 - (ASSizeRange)_constrainedSizeForLayoutPass
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   return [self _locked_constrainedSizeForLayoutPass];
 }
 
@@ -487,7 +489,7 @@ - (void)_layoutSublayouts
 
   ASLayout *layout;
   {
-    ASDN::MutexLocker l(__instanceLock__);
+    MutexLocker l(__instanceLock__);
     if (_calculatedDisplayNodeLayout.version < _layoutVersion) {
       return;
     }
@@ -517,13 +519,13 @@ @implementation ASDisplayNode (ASAutomaticSubnodeManagement)
 
 - (BOOL)automaticallyManagesSubnodes
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   return _automaticallyManagesSubnodes;
 }
 
 - (void)setAutomaticallyManagesSubnodes:(BOOL)automaticallyManagesSubnodes
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   _automaticallyManagesSubnodes = automaticallyManagesSubnodes;
 }
 
@@ -536,7 +538,7 @@ @implementation ASDisplayNode (ASLayoutTransition)
 
 - (BOOL)_isLayoutTransitionInvalid
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   return [self _locked_isLayoutTransitionInvalid];
 }
 
@@ -598,7 +600,7 @@ - (void)transitionLayoutWithSizeRange:(ASSizeRange)constrainedSize
   }
 
   {
-    ASDN::MutexLocker l(__instanceLock__);
+    MutexLocker l(__instanceLock__);
 
     // Check if we are a subnode in a layout transition.
     // In this case no measurement is needed as we're part of the layout transition.
@@ -680,7 +682,7 @@ - (void)transitionLayoutWithSizeRange:(ASSizeRange)constrainedSize
       {
         // Grab __instanceLock__ here to make sure this transition isn't invalidated
         // right after it passed the validation test and before it proceeds
-        ASDN::MutexLocker l(__instanceLock__);
+        MutexLocker l(__instanceLock__);
 
         // Update calculated layout
         const auto previousLayout = _calculatedDisplayNodeLayout;
@@ -750,37 +752,37 @@ - (void)cancelLayoutTransition
 
 - (void)setDefaultLayoutTransitionDuration:(NSTimeInterval)defaultLayoutTransitionDuration
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   _defaultLayoutTransitionDuration = defaultLayoutTransitionDuration;
 }
 
 - (NSTimeInterval)defaultLayoutTransitionDuration
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   return _defaultLayoutTransitionDuration;
 }
 
 - (void)setDefaultLayoutTransitionDelay:(NSTimeInterval)defaultLayoutTransitionDelay
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   _defaultLayoutTransitionDelay = defaultLayoutTransitionDelay;
 }
 
 - (NSTimeInterval)defaultLayoutTransitionDelay
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   return _defaultLayoutTransitionDelay;
 }
 
 - (void)setDefaultLayoutTransitionOptions:(UIViewAnimationOptions)defaultLayoutTransitionOptions
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   _defaultLayoutTransitionOptions = defaultLayoutTransitionOptions;
 }
 
 - (UIViewAnimationOptions)defaultLayoutTransitionOptions
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   return _defaultLayoutTransitionOptions;
 }
 
@@ -942,7 +944,7 @@ - (void)_assertSubnodeState
     return;
   }
 
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   NSArray<ASLayout *> *sublayouts = _calculatedDisplayNodeLayout.layout.sublayouts;
   unowned ASLayout *cSublayouts[sublayouts.count];
   [sublayouts getObjects:cSublayouts range:NSMakeRange(0, AS_ARRAY_SIZE(cSublayouts))];
@@ -993,7 +995,7 @@ - (void)_pendingLayoutTransitionDidComplete
   [self calculatedLayoutDidChange];
 
   // Grab lock after calling out to subclass
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
 
   // We generate placeholders at -layoutThatFits: time so that a node is guaranteed to have a placeholder ready to go.
   // This is also because measurement is usually asynchronous, but placeholders need to be set up synchronously.
@@ -1027,7 +1029,7 @@ - (void)_pendingLayoutTransitionDidComplete
 
 - (void)_setCalculatedDisplayNodeLayout:(const ASDisplayNodeLayout &)displayNodeLayout
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  MutexLocker l(__instanceLock__);
   [self _locked_setCalculatedDisplayNodeLayout:displayNodeLayout];
 }
 

Source/ASDisplayNode+LayoutSpec.mm

@@ -26,19 +26,19 @@ - (void)setLayoutSpecBlock:(ASLayoutSpecBlock)layoutSpecBlock
   // For now there should never be an override of layoutSpecThatFits: and a layoutSpecBlock together.
   ASDisplayNodeAssert(!(_methodOverrides & ASDisplayNodeMethodOverrideLayoutSpecThatFits),
                       @"Nodes with a .layoutSpecBlock must not also implement -layoutSpecThatFits:");
-  ASDN::MutexLocker l(__instanceLock__);
+  AS::MutexLocker l(__instanceLock__);
   _layoutSpecBlock = layoutSpecBlock;
 }
 
 - (ASLayoutSpecBlock)layoutSpecBlock
 {
-  ASDN::MutexLocker l(__instanceLock__);
+  AS::MutexLocker l(__instanceLock__);
   return _layoutSpecBlock;
 }
 
 - (ASLayout *)calculateLayoutLayoutSpec:(ASSizeRange)constrainedSize
 {
-  ASDN::UniqueLock l(__instanceLock__);
+  AS::UniqueLock l(__instanceLock__);
 
   // Manual size calculation via calculateSizeThatFits:
   if (_layoutSpecBlock == NULL && (_methodOverrides & ASDisplayNodeMethodOverrideLayoutSpecThatFits) == 0) {
@@ -82,7 +82,7 @@ - (ASLayout *)calculateLayoutLayoutSpec:(ASSizeRange)constrainedSize
 
   // Manually propagate the trait collection here so that any layoutSpec children of layoutSpec will get a traitCollection
   {
-    ASDN::SumScopeTimer t(_layoutSpecTotalTime, measureLayoutSpec);
+    AS::SumScopeTimer t(_layoutSpecTotalTime, measureLayoutSpec);
     ASTraitCollectionPropagateDown(layoutElement, self.primitiveTraitCollection);
   }
 
@@ -93,7 +93,7 @@ - (ASLayout *)calculateLayoutLayoutSpec:(ASSizeRange)constrainedSize
 
   // Layout element layout creation
   ASLayout *layout = ({
-    ASDN::SumScopeTimer t(_layoutComputationTotalTime, measureLayoutComputation);
+    AS::SumScopeTimer t(_layoutComputationTotalTime, measureLayoutComputation);
     [layoutElement layoutThatFits:constrainedSize];
   });
   ASDisplayNodeAssertNotNil(layout, @"[ASLayoutElement layoutThatFits:] should never return nil! %@, %@", self, layout);
@@ -123,13 +123,13 @@ - (ASLayout *)calculateLayoutLayoutSpec:(ASSizeRange)constrainedSize
 
   if (_layoutSpecBlock != NULL) {
     return ({
-      ASDN::MutexLocker l(__instanceLock__);
-      ASDN::SumScopeTimer t(_layoutSpecTotalTime, measureLayoutSpec);
+      AS::MutexLocker l(__instanceLock__);
+      AS::SumScopeTimer t(_layoutSpecTotalTime, measureLayoutSpec);
       _layoutSpecBlock(self, constrainedSize);
     });
   } else {
     return ({
-      ASDN::SumScopeTimer t(_layoutSpecTotalTime, measureLayoutSpec);
+      AS::SumScopeTimer t(_layoutSpecTotalTime, measureLayoutSpec);
       [self layoutSpecThatFits:constrainedSize];
     });
   }

Source/ASDisplayNode+Yoga.mm

@@ -305,7 +305,7 @@ - (void)invalidateCalculatedYogaLayout
 
 - (ASLayout *)calculateLayoutYoga:(ASSizeRange)constrainedSize
 {
-  ASDN::UniqueLock l(__instanceLock__);
+  AS::UniqueLock l(__instanceLock__);
 
   // There are several cases where Yoga could arrive here:
   // - This node is not in a Yoga tree: it has neither a yogaParent nor yogaChildren.