diff options
| author | simon | 2009-07-17 08:16:03 +0000 |
|---|---|---|
| committer | simon | 2009-07-17 08:16:03 +0000 |
| commit | c25947d9ef76e3aee1989817912a3d8218c8f07e (patch) | |
| tree | b7f4b6a636e7fec57f0032ae8ad3bed474910fa2 | |
| parent | 96d3de18714bfe78f901a3f79280bbb7f4e50ceb (diff) | |
| download | scilab2c-c25947d9ef76e3aee1989817912a3d8218c8f07e.tar.gz scilab2c-c25947d9ef76e3aee1989817912a3d8218c8f07e.tar.bz2 scilab2c-c25947d9ef76e3aee1989817912a3d8218c8f07e.zip | |
added test for Size
updated INIT_FillSCI2LibCDirs
| -rw-r--r-- | macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci | 54 | ||||
| -rw-r--r-- | tests/unit_tests/test_double_Size.sci | 41 |
2 files changed, 93 insertions, 2 deletions
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 970e033c..d458eafd 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -1505,7 +1505,7 @@ PrintStringInfo('c2s0'+ArgSeparator+'s0',ClassFileName,'file','y'); PrintStringInfo('z2d0'+ArgSeparator+'d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- -FunctionName = 'size'; +FunctionName = 'size'; // AS : Done PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'both','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); @@ -1528,7 +1528,7 @@ PrintStringInfo(ArgSeparator,ClassFileName,'file','y'); //NUT anche se metto Return funziona bene comunque! cerca di capire il motivo. //NUT limited use to zero in and out args only. // --- Annotation Function And Function List Function. --- -FunctionName = 'return'; +FunctionName = 'return';// PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'both','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); @@ -1564,16 +1564,66 @@ PrintStringInfo('d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('c0c0'+ArgSeparator+'s2',ClassFileName,'file','y'); PrintStringInfo('z0z0'+ArgSeparator+'d2',ClassFileName,'file','y'); + +PrintStringInfo('s0c0'+ArgSeparator+'s0',ClassFileName,'file','y'); +PrintStringInfo('d0z0'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('c0s0'+ArgSeparator+'s0',ClassFileName,'file','y'); +PrintStringInfo('z0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); + + +PrintStringInfo('s0c0'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('d0z0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('c0s0'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('z0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); + + + + PrintStringInfo('s0s0s0'+ArgSeparator+'s0',ClassFileName,'file','y'); PrintStringInfo('d0d0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); PrintStringInfo('c0c0c0'+ArgSeparator+'s0',ClassFileName,'file','y'); PrintStringInfo('z0z0z0'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('s0s0c0'+ArgSeparator+'s0',ClassFileName,'file','y'); +PrintStringInfo('s0c0s0'+ArgSeparator+'s0',ClassFileName,'file','y'); +PrintStringInfo('s0c0c0'+ArgSeparator+'s0',ClassFileName,'file','y'); + +PrintStringInfo('c0s0s0'+ArgSeparator+'s0',ClassFileName,'file','y'); +PrintStringInfo('c0c0s0'+ArgSeparator+'s0',ClassFileName,'file','y'); +PrintStringInfo('c0s0c0'+ArgSeparator+'s0',ClassFileName,'file','y'); + +PrintStringInfo('d0z0z0'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d0d0z0'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d0z0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); + +PrintStringInfo('z0d0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('z0z0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('z0d0z0'+ArgSeparator+'d0',ClassFileName,'file','y'); + + PrintStringInfo('s0s0s0'+ArgSeparator+'s2',ClassFileName,'file','y'); PrintStringInfo('d0d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('c0c0c0'+ArgSeparator+'s2',ClassFileName,'file','y'); PrintStringInfo('z0z0z0'+ArgSeparator+'d2',ClassFileName,'file','y'); + +PrintStringInfo('s0s0c0'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('s0c0s0'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('s0c0c0'+ArgSeparator+'s2',ClassFileName,'file','y'); + +PrintStringInfo('c0s0s0'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('c0c0s0'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('c0s0c0'+ArgSeparator+'s2',ClassFileName,'file','y'); + +PrintStringInfo('d0z0z0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('d0d0z0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('d0z0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); + +PrintStringInfo('z0d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('z0z0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('z0d0z0'+ArgSeparator+'d2',ClassFileName,'file','y'); + + // --- Annotation Function And Function List Function. --- FunctionName = 'OpColon'; PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'both','y'); diff --git a/tests/unit_tests/test_double_Size.sci b/tests/unit_tests/test_double_Size.sci new file mode 100644 index 00000000..e25f5627 --- /dev/null +++ b/tests/unit_tests/test_double_Size.sci @@ -0,0 +1,41 @@ +function test_double_Size() + disp(size(4)); + disp(size([1 2])) + disp(size(2+3*%i)); + disp(size([1 2 3 ; 4 5 6])); + disp(size([1 2 3 ; 4 5 6]*%i)); + e = %pi ; + disp(size(e)); // d0Sized0 + + f = e * %i; + disp(size(f));// z0Sized0 + + a = [1 2 3 ; 4 5 6]; + disp(size(a));// d2Sized0 + + b = [1 2 3 ; 4 5 6] * %i; + disp(size(b));// z2Sized0 + +// with a second argument + o=1; + + disp(size(4,1)); + disp(size(2+3*%i,1)); + disp(size([1 2 3 ; 4 5 6],o)); + disp(size([1 2 3 ; 4 5 6]*%i,1)); + e = %pi ; + disp(size(e,1)); // d0Sized0 + + f = e * %i; + disp(size(f,1));// z0Sized0 + + a = [1 2 3 ; 4 5 6]; + disp(size(a,o));// d2Sized0 + + b = [1 2 3 ; 4 5 6] * %i; + disp(size(b,1));// z2Sized0 + + + + +endfunction |