Welcome to the "trac"-ing site of soap4r!
[soap4r] [httpclient] [openpgp4u] [pkcs1] [logger] [csv] [vtr]

Changeset 1996

Show
Ignore:
Timestamp:
10/02/07 23:27:44 (1 year ago)
Author:
nahi
Message:
  • (merged from branches/1_5: -r1993:1995)
    • avoid NameError? if an Array definition has soapenc:Array as a restriction base and no soapenc:arrayType inside. (#441)
    • avoid name crash in generated classdef for simpleType enumeration. (#442)
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/wsdl/soap/classDefCreator.rb

    r1989 r1996  
    217217        constname += "_#{const[constname]}" 
    218218      end 
    219       c.def_const(constname, "#{classname}.new(#{ndq(value)})") 
     219      c.def_const(constname, "new(#{ndq(value)})") 
    220220    end 
    221221  end 

  • trunk/lib/wsdl/soap/complexType.rb

    r1969 r1996  
    107107      end 
    108108    end 
     109    nil 
    109110  end 
    110111 

  • trunk/test/wsdl/ref/expectedProduct.rb

    r1949 r1996  
    127127# {urn:ref}Rating 
    128128class Rating < ::String 
    129   C_0 = Rating.new("0") 
    130   C_1 = Rating.new("+1") 
    131   C_1_2 = Rating.new("-1") 
     129  C_0 = new("0") 
     130  C_1 = new("+1") 
     131  C_1_2 = new("-1") 
    132132end 
    133133 
    …… 
    236236# {urn:ref}yesno 
    237237class Yesno < ::String 
    238   N = Yesno.new("N") 
    239   Y = Yesno.new("Y") 
     238  N = new("N") 
     239  Y = new("Y") 
    240240end 
    241241 

  • trunk/test/wsdl/simpletype/rpc/expectedEchoVersion.rb

    r1891 r1996  
    1616# {urn:example.com:simpletype-rpc-type}version 
    1717class Version < ::String 
    18   C_16 = Version.new("1.6") 
    19   C_18 = Version.new("1.8") 
    20   C_19 = Version.new("1.9") 
     18  C_16 = new("1.6") 
     19  C_18 = new("1.8") 
     20  C_19 = new("1.9") 
    2121end 
    2222 
    2323# {urn:example.com:simpletype-rpc-type}stateType 
    2424class StateType < ::String 
    25   StateType = StateType.new("stateType") 
     25  StateType = new("stateType") 
    2626end 
    2727 
    2828# {urn:example.com:simpletype-rpc-type}zipIntType 
    2929class ZipIntType < ::String 
    30   C_123 = ZipIntType.new("123") 
     30  C_123 = new("123") 
    3131end 
    3232 

  • trunk/test/wsdl/soap/wsdl2ruby/expectedClassdef.rb

    r1891 r1996  
    1616# {urn:example.com:simpletype-rpc-type}version 
    1717class Version < ::String 
    18   C_16 = Version.new("1.6") 
    19   C_18 = Version.new("1.8") 
    20   C_19 = Version.new("1.9") 
     18  C_16 = new("1.6") 
     19  C_18 = new("1.8") 
     20  C_19 = new("1.9") 
    2121end