1 files changed, 50 insertions, 10 deletions

diff --git a/lib/wsdl/xmlSchema/attribute.rb b/lib/wsdl/xmlSchema/attribute.rb
index 6861fc171e..cfd4c68422 100644
--- a/lib/wsdl/xmlSchema/attribute.rb
+++ b/lib/wsdl/xmlSchema/attribute.rb
@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema attribute definition for WSDL.
-# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
 # This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
 # redistribute it and/or modify it under the same terms of Ruby's license;
@@ -14,34 +14,74 @@ module XMLSchema
 
 
 class Attribute < Info
-  attr_accessor :ref
-  attr_accessor :use
-  attr_accessor :form
-  attr_accessor :name
-  attr_accessor :type
-  attr_accessor :default
-  attr_accessor :fixed
+  class << self
+    if RUBY_VERSION > "1.7.0"
+      def attr_reader_ref(symbol)
+        name = symbol.to_s
+        self.__send__(:define_method, name, proc {
+          instance_variable_get("@#{name}") ||
+            (refelement ? refelement.__send__(name) : nil)
+        })
+      end
+    else
+      def attr_reader_ref(symbol)
+        name = symbol.to_s
+        module_eval <<-EOS
+          def #{name}
+            @#{name} || (refelement ? refelement.#{name} : nil)
+          end
+        EOS
+      end
+    end
+  end
+
+  attr_writer :use
+  attr_writer :form
+  attr_writer :name
+  attr_writer :type
+  attr_writer :local_simpletype
+  attr_writer :default
+  attr_writer :fixed
+
+  attr_reader_ref :use
+  attr_reader_ref :form
+  attr_reader_ref :name
+  attr_reader_ref :type
+  attr_reader_ref :local_simpletype
+  attr_reader_ref :default
+  attr_reader_ref :fixed
 
+  attr_accessor :ref
   attr_accessor :arytype
 
   def initialize
     super
-    @ref = nil
     @use = nil
     @form = nil
     @name = nil
     @type = nil
+    @local_simpletype = nil
     @default = nil
     @fixed = nil
+    @ref = nil
+    @refelement = nil
     @arytype = nil
   end
 
+  def refelement
+    @refelement ||= root.collect_attributes[@ref]
+  end
+
   def targetnamespace
     parent.targetnamespace
   end
 
   def parse_element(element)
-    nil
+    case element
+    when SimpleTypeName
+      @local_simpletype = SimpleType.new
+      @local_simpletype
+    end
   end
 
   def parse_attr(attr, value)