From: <wsf...@us...> - 2009-01-12 12:23:42
|
Revision: 11060 http://swig.svn.sourceforge.net/swig/?rev=11060&view=rev Author: wsfulton Date: 2009-01-12 11:42:27 +0000 (Mon, 12 Jan 2009) Log Message: ----------- Fix union.i module name and rename to union_parameter.i Modified Paths: -------------- trunk/Examples/test-suite/common.mk Added Paths: ----------- trunk/Examples/test-suite/tcl/union_parameter_runme.tcl trunk/Examples/test-suite/union_parameter.i Removed Paths: ------------- trunk/Examples/test-suite/tcl/union_runme.tcl trunk/Examples/test-suite/union.i Modified: trunk/Examples/test-suite/common.mk =================================================================== --- trunk/Examples/test-suite/common.mk 2009-01-12 08:57:16 UTC (rev 11059) +++ trunk/Examples/test-suite/common.mk 2009-01-12 11:42:27 UTC (rev 11060) @@ -451,7 +451,7 @@ struct_rename \ typedef_struct \ typemap_subst \ - union \ + union_parameter \ unions Copied: trunk/Examples/test-suite/tcl/union_parameter_runme.tcl (from rev 11059, trunk/Examples/test-suite/tcl/union_runme.tcl) =================================================================== --- trunk/Examples/test-suite/tcl/union_parameter_runme.tcl (rev 0) +++ trunk/Examples/test-suite/tcl/union_parameter_runme.tcl 2009-01-12 11:42:27 UTC (rev 11060) @@ -0,0 +1,36 @@ +if [ catch { load ./union_parameter[info sharedlibextension] union_parameter} err_msg ] { + puts stderr "Could not load shared object:\n$err_msg" +} + +set event [SDL_Event] + +for { set i 0 } { $i < 2 } { incr i } { +# puts -nonewline "Loop $i: " + set evAvailable [SDL_PollEvent $event] + set evType [$event cget -type] +# puts "evType = $evType" + + if { $evType == 1 } { + set specEvent [$event cget -active] +# puts "specEvent = $specEvent" + set type [$specEvent cget -type] + if { $type != $evType } { + error "Type $type should be $evType" + } + set gain [$specEvent cget -gain] + set state [$specEvent cget -state] +# puts "gain=$gain state=$state" + } + if { $evType == 2 } { + set specEvent [$event cget -key] +# puts "specEvent = $specEvent" + set type [$specEvent cget -type] + if { $type != $evType } { + error "Type $type should be $evType" + } + set which [$specEvent cget -which] + set state [$specEvent cget -state] +# puts "which=$which state=$state" + } +# puts "" +} Deleted: trunk/Examples/test-suite/tcl/union_runme.tcl =================================================================== --- trunk/Examples/test-suite/tcl/union_runme.tcl 2009-01-12 08:57:16 UTC (rev 11059) +++ trunk/Examples/test-suite/tcl/union_runme.tcl 2009-01-12 11:42:27 UTC (rev 11060) @@ -1,36 +0,0 @@ -if [ catch { load ./union[info sharedlibextension] unions} err_msg ] { - puts stderr "Could not load shared object:\n$err_msg" -} - -set event [SDL_Event] - -for { set i 0 } { $i < 2 } { incr i } { -# puts -nonewline "Loop $i: " - set evAvailable [SDL_PollEvent $event] - set evType [$event cget -type] -# puts "evType = $evType" - - if { $evType == 1 } { - set specEvent [$event cget -active] -# puts "specEvent = $specEvent" - set type [$specEvent cget -type] - if { $type != $evType } { - error "Type $type should be $evType" - } - set gain [$specEvent cget -gain] - set state [$specEvent cget -state] -# puts "gain=$gain state=$state" - } - if { $evType == 2 } { - set specEvent [$event cget -key] -# puts "specEvent = $specEvent" - set type [$specEvent cget -type] - if { $type != $evType } { - error "Type $type should be $evType" - } - set which [$specEvent cget -which] - set state [$specEvent cget -state] -# puts "which=$which state=$state" - } -# puts "" -} Deleted: trunk/Examples/test-suite/union.i =================================================================== --- trunk/Examples/test-suite/union.i 2009-01-12 08:57:16 UTC (rev 11059) +++ trunk/Examples/test-suite/union.i 2009-01-12 11:42:27 UTC (rev 11060) @@ -1,41 +0,0 @@ -%module unions - -%inline %{ - -typedef unsigned char Uint8; - -typedef struct SDL_ActiveEvent { - Uint8 type; /* SDL_ACTIVEEVENT */ - Uint8 gain; /* Whether given states were gained or lost (1/0) */ - Uint8 state; /* A mask of the focus states */ -} SDL_ActiveEvent; - -/* Keyboard event structure */ -typedef struct SDL_KeyboardEvent { - Uint8 type; /* SDL_KEYDOWN or SDL_KEYUP */ - int which; /* The keyboard device index */ - int state; /* SDL_PRESSED or SDL_RELEASED */ -} SDL_KeyboardEvent; - -typedef union { - Uint8 type; - SDL_ActiveEvent active; - SDL_KeyboardEvent key; -} SDL_Event; - -int SDL_PollEvent (SDL_Event *ev) { - static int toggle = 0; - if (toggle == 0) { - ev->type = 1; - ev->active.gain = 20; - ev->active.state = 30; - } else { - ev->type = 2; - ev->key.which = 2000; - ev->key.state = 3000; - } - toggle = 1 - toggle; - return 1; -} - -%} Copied: trunk/Examples/test-suite/union_parameter.i (from rev 11059, trunk/Examples/test-suite/union.i) =================================================================== --- trunk/Examples/test-suite/union_parameter.i (rev 0) +++ trunk/Examples/test-suite/union_parameter.i 2009-01-12 11:42:27 UTC (rev 11060) @@ -0,0 +1,41 @@ +%module union_parameter + +%inline %{ + +typedef unsigned char Uint8; + +typedef struct SDL_ActiveEvent { + Uint8 type; /* SDL_ACTIVEEVENT */ + Uint8 gain; /* Whether given states were gained or lost (1/0) */ + Uint8 state; /* A mask of the focus states */ +} SDL_ActiveEvent; + +/* Keyboard event structure */ +typedef struct SDL_KeyboardEvent { + Uint8 type; /* SDL_KEYDOWN or SDL_KEYUP */ + int which; /* The keyboard device index */ + int state; /* SDL_PRESSED or SDL_RELEASED */ +} SDL_KeyboardEvent; + +typedef union { + Uint8 type; + SDL_ActiveEvent active; + SDL_KeyboardEvent key; +} SDL_Event; + +int SDL_PollEvent (SDL_Event *ev) { + static int toggle = 0; + if (toggle == 0) { + ev->type = 1; + ev->active.gain = 20; + ev->active.state = 30; + } else { + ev->type = 2; + ev->key.which = 2000; + ev->key.state = 3000; + } + toggle = 1 - toggle; + return 1; +} + +%} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |