jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

properly manage the strange but valid case:

Browse source 
typedef char namet[5];
  const namet def_namet = {'h','o', 0, 'l','a'};

ie, char arrays with null embedded characters, and other odd
char[ANY] situations.

add the corresponding test to the primitive_types.i and runme files.

Marcelo

 ----------------------------------------------------------------------


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5685 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-01-24 07:20:59 +00:00
commit 59e7aca99a
4 changed files with 153 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Examples/test-suite/primitive_types.i
View file

@ -81,10 +81,17 @@
char name[5];
int val;
MyInt(int v = 0): val(v) { }
MyInt(int v = 0): val(v) {
name[0]='n';
}
operator int() const { return val; }
};
typedef char namet[5];
extern namet gbl_namet;
namet gbl_namet;
%}
//
// adding applies for incomplete swig type MyInt
@ -101,6 +108,7 @@
%apply long { pint };
//
// Some simple types
%inline %{
@ -114,8 +122,10 @@
char* const def_pchar = "hello";
const namet def_namet = "hola";//{'h','o','l','a',0};
const namet def_namet = {'h','o',0, 'l','a'};
extern namet gbl_namet;
%}
@ -305,15 +315,20 @@ macro(MyInt, pfx, myint)
%test_prim_types_int(ovr_decl, ovr);
const char* stringl(const char *str, size_t len)
int strlen(const char *str, size_t len)
{
return str;
return len;
}
int main(size_t argc, const char **argv)
int mainc(size_t argc, const char **argv)
{
return argc;
}
const char* mainv(size_t argc, const char **argv, int idx)
{
return argv[idx];
}
};
@ -327,6 +342,7 @@ macro(MyInt, pfx, myint)
virtual ~TestDirector()
{
var_namet[0]='h';
}
%test_prim_types_int(stc_decl, stc);

72
Examples/test-suite/python/primitive_types_runme.py
View file

@ -31,26 +31,26 @@ def pyerror(name, val, cte):
raise RuntimeError
pass
if cvar.var_bool != cct_bool: pyerror("bool", var_bool, cct_bool)
if cvar.var_schar != cct_schar: pyerror("schar", var_schar, cct_schar)
if cvar.var_uchar != cct_uchar: pyerror("uchar", var_uchar, cct_uchar)
if cvar.var_int != cct_int: pyerror("int", var_int, cct_int)
if cvar.var_uint != cct_uint: pyerror("uint", var_uint, cct_uint)
if cvar.var_short != cct_short: pyerror("short", var_short, cct_short)
if cvar.var_ushort != cct_ushort: pyerror("ushort", var_ushort, cct_ushort)
if cvar.var_long != cct_long: pyerror("long", var_long, cct_long)
if cvar.var_ulong != cct_ulong: pyerror("ulong", var_ulong, cct_ulong)
if cvar.var_llong != cct_llong: pyerror("llong", var_llong, cct_llong)
if cvar.var_ullong != cct_ullong: pyerror("ullong", var_ullong, cct_ullong)
if cvar.var_float != cct_float: pyerror("float", var_float, cct_float)
if cvar.var_double != cct_double: pyerror("double", var_double, cct_double)
if cvar.var_char != cct_char: pyerror("char", var_char, cct_char)
if cvar.var_pchar != cct_pchar: pyerror("pchar", var_pchar, cct_pchar)
if cvar.var_pint != cct_pint: pyerror("pint", var_pint, cct_pint)
if cvar.var_sizet != cct_sizet: pyerror("sizet", var_sizet, cct_sizet)
if cvar.var_hello != cct_hello: pyerror("hello", var_hello, cct_hello)
if cvar.var_myint != cct_myint: pyerror("myint", var_myint, cct_myint)
if cvar.var_namet != def_namet: pyerror("name", var_namet, def_namet)
if cvar.var_bool != cct_bool: pyerror("bool", cvar.var_bool, cct_bool)
if cvar.var_schar != cct_schar: pyerror("schar", cvar.var_schar, cct_schar)
if cvar.var_uchar != cct_uchar: pyerror("uchar", cvar.var_uchar, cct_uchar)
if cvar.var_int != cct_int: pyerror("int", cvar.var_int, cct_int)
if cvar.var_uint != cct_uint: pyerror("uint", cvar.var_uint, cct_uint)
if cvar.var_short != cct_short: pyerror("short", cvar.var_short, cct_short)
if cvar.var_ushort != cct_ushort: pyerror("ushort", cvar.var_ushort, cct_ushort)
if cvar.var_long != cct_long: pyerror("long", cvar.var_long, cct_long)
if cvar.var_ulong != cct_ulong: pyerror("ulong", cvar.var_ulong, cct_ulong)
if cvar.var_llong != cct_llong: pyerror("llong", cvar.var_llong, cct_llong)
if cvar.var_ullong != cct_ullong: pyerror("ullong", cvar.var_ullong, cct_ullong)
if cvar.var_float != cct_float: pyerror("float", cvar.var_float, cct_float)
if cvar.var_double != cct_double: pyerror("double", cvar.var_double, cct_double)
if cvar.var_char != cct_char: pyerror("char", cvar.var_char, cct_char)
if cvar.var_pchar != cct_pchar: pyerror("pchar", cvar.var_pchar, cct_pchar)
if cvar.var_pint != cct_pint: pyerror("pint", cvar.var_pint, cct_pint)
if cvar.var_sizet != cct_sizet: pyerror("sizet", cvar.var_sizet, cct_sizet)
if cvar.var_hello != cct_hello: pyerror("hello", cvar.var_hello, cct_hello)
if cvar.var_myint != cct_myint: pyerror("myint", cvar.var_myint, cct_myint)
if cvar.var_namet != def_namet: pyerror("name", cvar.var_namet, def_namet)
class PyTest (TestDirector):
def __init__(self):
@ -157,10 +157,36 @@ t.var_namet = def_namet
t.v_check()
if def_namet != 'hola':
raise RuntimeError, "bad namet"
# this value contains a '0' char!
if def_namet != 'ho\0la':
print "bad namet", def_namet
raise RuntimeError
t.var_namet = def_namet
if t.var_namet != def_namet:
print "bad namet", t.var_namet
raise RuntimeError
t.var_namet = 'holac'
if t.var_namet != 'holac':
raise RuntimeError, "bad namet"
print "bad namet", t.var_namet
raise RuntimeError
t.var_namet = 'hol'
if t.var_namet != 'hol':
print "bad namet", t.var_namet
raise RuntimeError
largs=['hi','hola','hello']
if t.mainc(largs) != 3:
raise RuntimeError, "bad main typemap"
targs=('hi','hola')
if t.mainv(targs,1) != 'hola':
raise RuntimeError, "bad main typemap"
if t.strlen('hile') != 4:
raise RuntimeError, "bad string typemap"