11 files changed, 25 insertions, 33 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 825be5a0a8..04f0b5e7ce 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -964,11 +964,11 @@ class CGI
     end
 
     # Get the cookies as a hash of cookie-name=>Cookie pairs.
-    attr_accessor("cookies")
+    attr_accessor :cookies
 
     # Get the parameters as a hash of name=>values pairs, where
     # values is an Array.
-    attr("params")
+    attr_reader :params
 
     # Set all the parameters.
     def params=(hash)
diff --git a/lib/complex.rb b/lib/complex.rb
index 8832f17f82..516bbbfd89 100644
--- a/lib/complex.rb
+++ b/lib/complex.rb
@@ -400,10 +400,10 @@ class Complex < Numeric
   I = Complex(0,1)
   
   # The real part of a complex number.
-  attr :real
+  attr_reader :real
 
   # The imaginary part of a complex number.
-  attr :image
+  attr_reader :image
   alias imag image
   
 end
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 04c353c04e..9690469e0c 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -972,7 +972,7 @@ module DRb
     def initialize(option)
       @option = option.to_s
     end
-    attr :option
+    attr_reader :option
     def to_s; @option; end
     
     def ==(other)
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index ea26b374ec..4decab54aa 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -84,7 +84,7 @@ class IPAddr
   IN6FORMAT = (["%.4x"] * 8).join(':')
 
   # Returns the address family of this IP address.
-  attr :family
+  attr_reader :family
 
   # Creates a new ipaddr containing the given network byte ordered
   # string form of an IP address.
diff --git a/lib/irb/ruby-token.rb b/lib/irb/ruby-token.rb
index 525d4df14c..0a297d28fa 100644
--- a/lib/irb/ruby-token.rb
+++ b/lib/irb/ruby-token.rb
@@ -29,9 +29,7 @@ module RubyToken
       @line_no = line_no
       @char_no = char_no
     end
-    attr :seek
-    attr :line_no
-    attr :char_no
+    attr :seek, :line_no, :char_no
   end
 
   class TkNode < Token
@@ -58,7 +56,7 @@ module RubyToken
   end
 
   class TkOp < Token
-    attr :name, true
+    attr_accessor :name
   end
 
   class TkOPASGN < TkOp
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index 4fe5180ba6..0186b023a1 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -466,11 +466,10 @@ class RubyLex
     @exception_on_syntax_error = true
   end
 
-  attr :skip_space, true
-  attr :read_auto_clean_up, true
-  attr :exception_on_syntax_error, true
-
-  attr :indent
+  attr_accessor :skip_space
+  attr_accessor :read_auto_clean_up
+  attr_accessor :exception_on_syntax_error
+  attr_reader :indent
 
   # io functions
   def line_no
diff --git a/lib/shell.rb b/lib/shell.rb
index 039f849ef5..9c6847c623 100644
--- a/lib/shell.rb
+++ b/lib/shell.rb
@@ -31,9 +31,7 @@ class Shell
   @verbose = true
 
   class << Shell
-    attr :cascade, true
-    attr :debug, true
-    attr :verbose, true
+    attr_accessor :cascade, :debug, :verbose
 
 #    alias cascade? cascade
     alias debug? debug
@@ -98,11 +96,8 @@ class Shell
     rehash
   end
 
-  attr :umask, true
-  attr :record_separator, true
-
-  attr :verbose, true
-  attr :debug, true
+  attr_accessor :umask, :record_separator
+  attr_accessor :verbose, :debug
 
   def debug=(val)
     @debug = val
diff --git a/lib/soap/mapping/registry.rb b/lib/soap/mapping/registry.rb
index 823e80666d..a4183fea57 100644
--- a/lib/soap/mapping/registry.rb
+++ b/lib/soap/mapping/registry.rb
@@ -522,7 +522,7 @@ private
     list = (class << obj; self; end).ancestors - obj.class.ancestors
     unless list.empty?
       node.extraattr[RubyExtendName] = list.collect { |c|
-	if c.name.empty?
+	unless c.name
   	  raise TypeError.new("singleton can't be dumped #{ obj }")
    	end
 	c.name
diff --git a/lib/soap/mapping/rubytypeFactory.rb b/lib/soap/mapping/rubytypeFactory.rb
index 61c21d8b20..6c30f23a7b 100644
--- a/lib/soap/mapping/rubytypeFactory.rb
+++ b/lib/soap/mapping/rubytypeFactory.rb
@@ -262,7 +262,7 @@ private
   end
 
   def unknownobj2soap(soap_class, obj, info, map)
-    if obj.class.name.empty?
+    unless obj.class.name
       raise TypeError.new("can't dump anonymous class #{obj}")
     end
     singleton_class = class << obj; self; end
diff --git a/lib/sync.rb b/lib/sync.rb
index 566cfbfb2d..93474e1caa 100644
--- a/lib/sync.rb
+++ b/lib/sync.rb
@@ -232,13 +232,13 @@ module Sync_m
     end
   end
 
-  attr :sync_mode, true
+  attr_accessor :sync_mode
     
-  attr :sync_waiting, true
-  attr :sync_upgrade_waiting, true
-  attr :sync_sh_locker, true
-  attr :sync_ex_locker, true
-  attr :sync_ex_count, true
+  attr_accessor :sync_waiting
+  attr_accessor :sync_upgrade_waiting
+  attr_accessor :sync_sh_locker
+  attr_accessor :sync_ex_locker
+  attr_accessor :sync_ex_count
     
   private
 
diff --git a/lib/tracer.rb b/lib/tracer.rb
index 71aa49c306..22f32bf222 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -19,9 +19,9 @@ class Tracer
   @stdout = STDOUT
   @verbose = false
   class << self
-    attr :verbose, true
+    attr_accessor :verbose
     alias verbose? verbose
-    attr :stdout, true
+    attr_accessor :stdout
   end
   
   EVENT_SYMBOL = {