AtomicMarkableReference: address PR comments

Author: ianks

lib/concurrent/atomic/atomic_markable_reference.rb

@@ -1,10 +1,7 @@
-module Edge
-  module Concurrent
+module Concurrent
+  module Edge
     # @!macro atomic_markable_reference
     class AtomicMarkableReference < ::Concurrent::Synchronization::Object
-      # TODO: Remove once out of edge module
-      include ::Concurrent
-
       # @!macro [attach] atomic_markable_reference_method_initialize
       def initialize(value = nil, mark = false)
         super
@@ -85,9 +82,7 @@ def mark
       #
       #   @return [ImmutableArray] both the new value and the new mark
       def set(new_val, new_mark)
-        ImmutableArray[new_val, new_mark].tap do |pair|
-          @Reference.set pair
-        end
+        @Reference.set ImmutableArray[new_val, new_mark]
       end
 
       # @!macro [attach] atomic_markable_reference_method_update
@@ -104,7 +99,7 @@ def set(new_val, new_mark)
       # @return [ImmutableArray] the new value and new mark
       def update
         loop do
-          old_val, old_mark = value, marked?
+          old_val, old_mark = @Reference.get
           new_val, new_mark = yield old_val, old_mark
 
           if compare_and_set old_val, new_val, old_mark, new_mark
@@ -128,7 +123,7 @@ def update
       #
       # @raise [Concurrent::ConcurrentUpdateError] if the update fails
       def try_update
-        old_val, old_mark = value, marked?
+        old_val, old_mark = @Reference.get
         new_val, new_mark = yield old_val, old_mark
 
         unless compare_and_set old_val, new_val, old_mark, new_mark

spec/concurrent/atomic/atomic_markable_reference_spec.rb

@@ -1,8 +1,7 @@
-# Concurrent::AtomicMarkableReference;w
 shared_examples :atomic_markable_reference do
   # use a number outside JRuby's fixnum cache range, to ensure identity is
   # preserved
-  let(:atomic) { Edge::Concurrent::AtomicMarkableReference.new 1000, true }
+  let(:atomic) { Concurrent::Edge::AtomicMarkableReference.new 1000, true }
 
   specify :test_construct do
     expect(atomic.value).to eq 1000
@@ -87,8 +86,8 @@
 end
 
 # Specs for platform specific implementations
-module Edge
-  module Concurrent
+module Concurrent
+  module Edge
     describe AtomicMarkableReference do
       it_should_behave_like :atomic_markable_reference
     end