Fix test for std::string global and member variables being wrapped as strings by default
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8600 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
128cc0d2ed
commit
dedfcfdb60
1 changed files with 2 additions and 9 deletions
|
|
@ -62,21 +62,16 @@ assert(ok==false and type(ex)=="userdata") -- failed & threw object
|
||||||
|
|
||||||
s=Structure()
|
s=Structure()
|
||||||
|
|
||||||
-- because of the SWIG's 'everything else is a ptr'
|
-- testing std::string
|
||||||
-- member strings are a little unusal
|
|
||||||
assert(is_std_string(s.MemberString)) -- std::string*
|
|
||||||
assert(type(s.MemberString2)=="string") -- typemaps make this a string
|
assert(type(s.MemberString2)=="string") -- typemaps make this a string
|
||||||
assert(is_std_string(s.ConstMemberString)) -- std::string*
|
assert(is_std_string(s.ConstMemberString)) -- std::string*
|
||||||
|
|
||||||
-- set them
|
-- set them
|
||||||
s.MemberString:assign("a") -- as its std::string* must use assign
|
|
||||||
s.MemberString2="b" -- typemaps ok
|
s.MemberString2="b" -- typemaps ok
|
||||||
s.ConstMemberString="c" -- silently ignored
|
s.ConstMemberString="c" -- silently ignored
|
||||||
s.ConstMemberString:assign("c") -- works (oops!!!)
|
|
||||||
--print(s.MemberString:data(),s.MemberString2,s.ConstMemberString:data())
|
--print(s.MemberString:data(),s.MemberString2,s.ConstMemberString:data())
|
||||||
|
|
||||||
--check type again
|
--check type again
|
||||||
assert(is_std_string(s.MemberString)) -- std::string*
|
|
||||||
assert(type(s.MemberString2)=="string") -- typemaps make this a string
|
assert(type(s.MemberString2)=="string") -- typemaps make this a string
|
||||||
assert(is_std_string(s.ConstMemberString)) -- std::string*
|
assert(is_std_string(s.ConstMemberString)) -- std::string*
|
||||||
|
|
||||||
|
|
@ -84,12 +79,10 @@ assert(is_std_string(s.ConstMemberString)) -- std::string*
|
||||||
-- so we must still use the module name
|
-- so we must still use the module name
|
||||||
|
|
||||||
-- check static type
|
-- check static type
|
||||||
assert(is_std_string(li_std_string.Structure_StaticMemberString))
|
|
||||||
assert(type(li_std_string.Structure_StaticMemberString2)=="string")
|
assert(type(li_std_string.Structure_StaticMemberString2)=="string")
|
||||||
assert(is_std_string(li_std_string.Structure_ConstStaticMemberString))
|
assert(is_std_string(li_std_string.Structure_ConstStaticMemberString))
|
||||||
|
|
||||||
-- try setting
|
-- try setting
|
||||||
li_std_string.Structure_StaticMemberString:assign('d')
|
|
||||||
li_std_string.Structure_StaticMemberString2='e'
|
li_std_string.Structure_StaticMemberString2='e'
|
||||||
li_std_string.Structure_ConstStaticMemberString='f' -- silently ignored
|
li_std_string.Structure_ConstStaticMemberString='f' -- silently ignored
|
||||||
li_std_string.Structure_ConstStaticMemberString:assign('f') -- works (oops!!!)
|
li_std_string.Structure_ConstStaticMemberString:assign('f') -- works (oops!!!)
|
||||||
|
|
@ -98,7 +91,7 @@ li_std_string.Structure_ConstStaticMemberString:assign('f') -- works (oops!!!)
|
||||||
li_std_string.Structure_ConstStaticMemberString:data())]]
|
li_std_string.Structure_ConstStaticMemberString:data())]]
|
||||||
|
|
||||||
-- check static type again
|
-- check static type again
|
||||||
assert(is_std_string(li_std_string.Structure_StaticMemberString))
|
assert(type(li_std_string.Structure_StaticMemberString)=="string")
|
||||||
assert(type(li_std_string.Structure_StaticMemberString2)=="string")
|
assert(type(li_std_string.Structure_StaticMemberString2)=="string")
|
||||||
assert(is_std_string(li_std_string.Structure_ConstStaticMemberString))
|
assert(is_std_string(li_std_string.Structure_ConstStaticMemberString))
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue