Update

2 files changed, 52 insertions, 19 deletions

diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
index b562894f..e9d11acd 100644
--- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
+++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
@@ -5,26 +5,34 @@ function mainfunction()
 
 // test fftshift
 
-disp(fftshift(4))
-disp(fftshift(5,1))
-disp(fftshift(6,2))
+//1 input argument
+disp(fft(4))
 
-disp(fftshift(4-%i))
-disp(fftshift(4-%i*2,1))
-disp(fftshift(4-%i*3,2))
+disp(fft([3 4 2 1; 1 4 5 2]));
 
-a=[2 3 4 8; 8 4 5 6;1 2 3 4; 14 5 8 7; 1 2 6 7]
-b=[2 3 4 8;1 2 6+3*%i 7]
+disp(fft(4-%i))
 
 
-disp(fftshift(a))
-disp(fftshift(a,1))
-disp(fftshift(a,2))
+disp(fft([3+%i*2 4 2-%i 1; 1-%i*2 4 5 2]));
 
+//2 input arguments
 
-disp(fftshift(b))
-disp(fftshift(b,1))
-disp(fftshift(b,2))
+disp(fft(4,1))
 
+disp(fft([3 4 2 1; 1 4 5 2],1));
+
+disp(fft(4-%i,1))
+
+
+disp(fft([3+%i*2 4 2-%i 1; 1-%i*2 4 5 2],1));
+
+disp(fft(4,-1))
+
+disp(fft([3 4 2 1; 1 4 5 2],-1));
+
+disp(fft(4-%i,-1))
+
+
+disp(fft([3+%i*2 4 2-%i 1; 1-%i*2 4 5 2],-1));
 
 endfunction
diff --git a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 163c1816..b1d3637e 100644
--- a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -406,6 +406,10 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'both',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
 
+
+
+
+
 // --------------------
 // --- Class Zeros. ---
 // --------------------
@@ -2134,18 +2138,23 @@ PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'both','y');
 ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
 PrintStringInfo('NIN=          1',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP=    FA_TP_COMPLEX(IN(1).TP)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
 
 // --- Function List Class. ---
 //NUT: no mixed data types
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+
+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
 PrintStringInfo('s0'+ArgSeparator+'c0',ClassFileName,'file','y');
 PrintStringInfo('d0'+ArgSeparator+'z0',ClassFileName,'file','y');
 PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
 PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
 
+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
 PrintStringInfo('s2'+ArgSeparator+'c2',ClassFileName,'file','y');
 PrintStringInfo('d2'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
@@ -2167,63 +2176,79 @@ PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'both','y');
 ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
 PrintStringInfo('NIN=          1',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP=    FA_TP_COMPLEX(IN(1).TP)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
 PrintStringInfo('NIN=          2',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP=    FA_TP_COMPLEX(IN(1).TP)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
 PrintStringInfo('NIN=          3',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP=    FA_TP_COMPLEX(IN(1).TP)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
 PrintStringInfo('NIN=          4',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP=    FA_TP_COMPLEX(IN(1).TP)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
 
 // --- Function List Class. ---
 //NUT: no mixed data types
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
 PrintStringInfo('s0'+ArgSeparator+'c0',ClassFileName,'file','y');
 PrintStringInfo('d0'+ArgSeparator+'z0',ClassFileName,'file','y');
 PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
 PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
 
+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
 PrintStringInfo('s2'+ArgSeparator+'c2',ClassFileName,'file','y');
 PrintStringInfo('d2'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
 PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
 
+PrintStringInfo('s0s0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
 PrintStringInfo('s0s0'+ArgSeparator+'c0',ClassFileName,'file','y');
 PrintStringInfo('d0d0'+ArgSeparator+'z0',ClassFileName,'file','y');
 PrintStringInfo('c0s0'+ArgSeparator+'c0',ClassFileName,'file','y');
 PrintStringInfo('z0d0'+ArgSeparator+'z0',ClassFileName,'file','y');
 
+PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
 PrintStringInfo('s2s0'+ArgSeparator+'c2',ClassFileName,'file','y');
 PrintStringInfo('d2d0'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('c2s0'+ArgSeparator+'c2',ClassFileName,'file','y');
 PrintStringInfo('z2d0'+ArgSeparator+'z2',ClassFileName,'file','y');
 
+PrintStringInfo('s0s0s0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
 PrintStringInfo('s0s0s0'+ArgSeparator+'c0',ClassFileName,'file','y');
 PrintStringInfo('d0d0d0'+ArgSeparator+'z0',ClassFileName,'file','y');
 PrintStringInfo('c0s0s0'+ArgSeparator+'c0',ClassFileName,'file','y');
 PrintStringInfo('z0d0d0'+ArgSeparator+'z0',ClassFileName,'file','y');
 
+PrintStringInfo('s2s0s0'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('d2d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
 PrintStringInfo('s2s0s0'+ArgSeparator+'c2',ClassFileName,'file','y');
 PrintStringInfo('d2d0d0'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('c2s0s0'+ArgSeparator+'c2',ClassFileName,'file','y');
 PrintStringInfo('z2d0d0'+ArgSeparator+'z2',ClassFileName,'file','y');
 
+PrintStringInfo('s0s0s0s0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
 PrintStringInfo('s0s0s0s0'+ArgSeparator+'c0',ClassFileName,'file','y');
 PrintStringInfo('d0d0d0d0'+ArgSeparator+'z0',ClassFileName,'file','y');
 PrintStringInfo('c0s0s0s0'+ArgSeparator+'c0',ClassFileName,'file','y');
 PrintStringInfo('z0d0d0d0'+ArgSeparator+'z0',ClassFileName,'file','y');
 
+PrintStringInfo('s2s0s0s0'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('d2d0d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
 PrintStringInfo('s2s0s0s0'+ArgSeparator+'c2',ClassFileName,'file','y');
 PrintStringInfo('d2d0d0d0'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('c2s0s0s0'+ArgSeparator+'c2',ClassFileName,'file','y');