Changeset 1699

Timestamp:

08/09/06 21:35:27 (2 years ago)

Author:

nahi

Message:

classDefCreator crash for a WSDL containing a complexType that extends another complexType which is itself an extension of simpleContent. fixes #231.

Files:

• trunk/lib/wsdl/xmlSchema/complexExtension.rb (modified) (2 diffs)
• trunk/test/wsdl/ref/expectedProduct.rb (modified) (1 diff)
• trunk/test/wsdl/ref/product.wsdl (modified) (1 diff)

trunk/lib/wsdl/xmlSchema/complexExtension.rb

@@ -1 +1 @@
-# WSDL4R - XMLSchema complexType extension definition for WSDL.
-
+, 2006
-
-# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
@@ -54 +54 @@
-    if @base == ::SOAP::ValueArrayName
-      :TYPE_ARRAY
+    elsif content
+      :TYPE_STRUCT
-    else
-      basetype.check_type

trunk/test/wsdl/ref/expectedProduct.rb

@@ -155 +155 @@
-  end
-end
+
+# {urn:ref}Document
+#   contains SOAP::SOAPString
+class Document < ::String
+  @@schema_attribute = {
+    XSD::QName.new(nil, "ID") => "SOAP::SOAPString"
+  }
+
+  def xmlattr_ID
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "ID")]
+  end
+
+  def xmlattr_ID=(value)
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "ID")] = value
+  end
+
+  def initialize(*arg)
+    super
+    @__xmlattr = {}
+  end
+end
+
+# {urn:ref}DerivedChoice_BaseSimpleContent
+class DerivedChoice_BaseSimpleContent
+  @@schema_type = "DerivedChoice_BaseSimpleContent"
+  @@schema_ns = "urn:ref"
+  @@schema_attribute = {
+    XSD::QName.new(nil, "attrStringExt") => "SOAP::SOAPString"
+  }
+  @@schema_element = [ :choice,
+    ["varStringExt", ["SOAP::SOAPString", XSD::QName.new(nil, "varStringExt")]],
+    ["varFloatExt", ["SOAP::SOAPFloat", XSD::QName.new(nil, "varFloatExt")]]
+  ]
+
+  attr_accessor :varStringExt
+  attr_accessor :varFloatExt
+
+  def xmlattr_attrStringExt
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "attrStringExt")]
+  end
+
+  def xmlattr_attrStringExt=(value)
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "attrStringExt")] = value
+  end
+
+  def initialize(varStringExt = nil, varFloatExt = nil)
+    @varStringExt = varStringExt
+    @varFloatExt = varFloatExt
+    @__xmlattr = {}
+  end
+end

trunk/test/wsdl/ref/product.wsdl

@@ -90 +90 @@
-        </complexType>
-      </element>
+
+      <complexType name="Document">
+        <simpleContent>
+          <extension base="string">
+            <attribute name="ID" type="xsd:string"/>
+          </extension>
+        </simpleContent>
+      </complexType>
+
+      <complexType name="DerivedChoice_BaseSimpleContent">
+        <complexContent mixed="false">
+          <extension base="tns:Document">
+            <choice>
+              <element name="varStringExt" type="xsd:string"/>
+              <element name="varFloatExt" type="xsd:float"/>
+            </choice>
+            <attribute name="attrStringExt" type="xsd:string"/>
+          </extension>
+        </complexContent>
+      </complexType>
-    </xsd:schema>
-  </types>