From 820e3a8491100ed24a6a33df07afee341956a45c Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sat, 27 Mar 2010 11:29:10 -0300
Subject: LINE on class_eval need + 1, also removed comments [#4281
 state:committed]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 .../core_ext/class/attribute_accessors.rb          | 51 ++++++++++++----------
 .../core_ext/module/attribute_accessors.rb         | 40 ++++++++---------
 2 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
index be34a5a96f..feef5d2d57 100644
--- a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
+++ b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
@@ -13,19 +13,20 @@ class Class
     options = syms.extract_options!
     syms.each do |sym|
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        unless defined? @@#{sym}  # unless defined? @@hair_colors
-          @@#{sym} = nil          #   @@hair_colors = nil
-        end                       # end
-                                  #
-        def self.#{sym}           # def self.hair_colors
-          @@#{sym}                #   @@hair_colors
-        end                       # end
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}
+          @@#{sym}
+        end
       EOS
+
       unless options[:instance_reader] == false
-        class_eval(<<-EOS, __FILE__, __LINE__)
-          def #{sym}              # def hair_colors
-            @@#{sym}              #   @@hair_colors
-          end                     # end
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}
+            @@#{sym}
+          end
         EOS
       end
     end
@@ -35,20 +36,22 @@ class Class
     options = syms.extract_options!
     syms.each do |sym|
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        unless defined? @@#{sym}                       # unless defined? @@hair_colors
-          @@#{sym} = nil                               #   @@hair_colors = nil
-        end                                            # end
-                                                       #
-        def self.#{sym}=(obj)                          # def self.hair_colors=(obj)
-          @@#{sym} = obj                               #   @@hair_colors = obj
-        end                                            # end
-                                                       #
-        #{"                                            #
-        def #{sym}=(obj)                               # def hair_colors=(obj)
-          @@#{sym} = obj                               #   @@hair_colors = obj
-        end                                            # end
-        " unless options[:instance_writer] == false }  # # instance writer above is generated unless options[:instance_writer] == false
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
       EOS
+
+      unless options[:instance_writer] == false
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}=(obj)
+            @@#{sym} = obj
+          end
+        EOS
+      end
       self.send("#{sym}=", yield) if block_given?
     end
   end
diff --git a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
index c315fd5812..9c4d5fae26 100644
--- a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
+++ b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
@@ -5,20 +5,20 @@ class Module
     options = syms.extract_options!
     syms.each do |sym|
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        unless defined? @@#{sym}  # unless defined? @@pagination_options
-          @@#{sym} = nil          #   @@pagination_options = nil
-        end                       # end
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
 
-        def self.#{sym}           # def self.pagination_options
-          @@#{sym}                #   @@pagination_options
-        end                       # end
+        def self.#{sym}
+          @@#{sym}
+        end
       EOS
       
       unless options[:instance_reader] == false
-        class_eval(<<-EOS, __FILE__, __LINE__)
-          def #{sym}              # def hair_colors
-            @@#{sym}              #   @@hair_colors
-          end                     # end
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}
+            @@#{sym}
+          end
         EOS
       end
     end
@@ -28,20 +28,20 @@ class Module
     options = syms.extract_options!
     syms.each do |sym|
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        unless defined? @@#{sym}                       # unless defined? @@pagination_options
-          @@#{sym} = nil                               #   @@pagination_options = nil
-        end                                            # end
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
 
-        def self.#{sym}=(obj)                          # def self.pagination_options=(obj)
-          @@#{sym} = obj                               #   @@pagination_options = obj
-        end                                            # end
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
       EOS
 
       unless options[:instance_writer] == false
-        class_eval(<<-EOS, __FILE__, __LINE__)
-          def #{sym}=(obj)                             # def pagination_options=(obj)
-            @@#{sym} = obj                             #   @@pagination_options = obj
-          end                                          # end
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}=(obj)
+            @@#{sym} = obj
+          end
         EOS
       end
     end
-- 
cgit v1.2.3