Changeset 1820

Timestamp:

05/30/07 23:49:09 (1 year ago)

Author:

nahi

Message:

• sort complextype definitions according to those base-derived class order. closes #349.
  

Files:

• trunk/lib/wsdl/soap/classDefCreator.rb (modified) (2 diffs)

trunk/lib/wsdl/soap/classDefCreator.rb

@@ -106 +106 @@
-
-  def dump_complextype
-
-
-
-
-
-
-
+
+
+
-  end
-
@@ -372 +368 @@
-    end
-  end
+
+  def sort_dependency(types)
+    dep = {}
+    root = []
+    types.each do |type|
+      if type.complexcontent and (base = type.complexcontent.base)
+        dep[base] ||= []
+        dep[base] << type
+      else
+        root << type
+      end
+    end
+    sorted = []
+    root.each do |type|
+      sorted.concat(collect_dependency(type, dep))
+      dep.delete(type.name)
+    end
+    sorted.concat(dep.values.flatten)
+    sorted
+  end
+
+  def collect_dependency(type, dep)
+    result = [type]
+    return result unless dep.key?(type.name)
+    dep[type.name].each do |deptype|
+      result.concat(collect_dependency(deptype, dep))
+    end
+    result
+  end
-end
-