Update

4 files changed, 63 insertions, 20 deletions

diff --git a/scilab2c/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/scilab2c/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
index b562894f..e9d11acd 100644
--- a/scilab2c/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
+++ b/scilab2c/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/scilab2c/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/scilab2c/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 163c1816..b1d3637e 100644
--- a/scilab2c/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/scilab2c/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');
diff --git a/scilab2c/src/configure b/scilab2c/src/configure
index f7807b3f..3fba708e 100755
--- a/scilab2c/src/configure
+++ b/scilab2c/src/configure
@@ -22149,7 +22149,7 @@ fi
 #operations/multiplication/Makefile
 #operations/division/Makefile
 
-ac_config_files="$ac_config_files Makefile lib/blas/Makefile lib/lapack/Makefile type/Makefile operations/Makefile operations/addition/Makefile operations/subtraction/Makefile operations/division/Makefile operations/multiplication/Makefile matrixOperations/Makefile matrixOperations/multiplication/Makefile matrixOperations/division/Makefile matrixOperations/cat/Makefile matrixOperations/transpose/Makefile matrixOperations/trace/Makefile matrixOperations/hilbert/Makefile matrixOperations/expm/Makefile matrixOperations/eye/Makefile matrixOperations/ones/Makefile matrixOperations/infiniteNorm/Makefile matrixOperations/inversion/Makefile matrixOperations/jmat/Makefile matrixOperations/chol/Makefile matrixOperations/determ/Makefile matrixOperations/dist/Makefile matrixOperations/fill/Makefile matrixOperations/magnitude/Makefile matrixOperations/squaredMagnitude/Makefile matrixOperations/logm/Makefile matrixOperations/powm/Makefile matrixOperations/zeros/Makefile matrixOperations/spec/Makefile matrixOperations/spec2/Makefile implicitList/Makefile elementaryFunctions/Makefile elementaryFunctions/cos/Makefile elementaryFunctions/cosh/Makefile elementaryFunctions/acos/Makefile elementaryFunctions/acosh/Makefile elementaryFunctions/sin/Makefile elementaryFunctions/sinh/Makefile elementaryFunctions/asin/Makefile elementaryFunctions/asinh/Makefile elementaryFunctions/tan/Makefile elementaryFunctions/tanh/Makefile elementaryFunctions/atan/Makefile elementaryFunctions/atan2/Makefile elementaryFunctions/atanh/Makefile elementaryFunctions/log/Makefile elementaryFunctions/log1p/Makefile elementaryFunctions/log10/Makefile elementaryFunctions/exp/Makefile elementaryFunctions/exp10/Makefile elementaryFunctions/sqrt/Makefile elementaryFunctions/lnp1m1/Makefile elementaryFunctions/pow/Makefile auxiliaryFunctions/Makefile auxiliaryFunctions/abs/Makefile auxiliaryFunctions/find/Makefile auxiliaryFunctions/find2d/Makefile auxiliaryFunctions/frexp/Makefile auxiliaryFunctions/isempty/Makefile auxiliaryFunctions/isnan/Makefile auxiliaryFunctions/rand/Makefile auxiliaryFunctions/sign/Makefile auxiliaryFunctions/size/Makefile auxiliaryFunctions/length/Makefile auxiliaryFunctions/type/Makefile auxiliaryFunctions/pythag/Makefile auxiliaryFunctions/conj/Makefile statisticsFunctions/Makefile statisticsFunctions/mean/Makefile statisticsFunctions/prod/Makefile statisticsFunctions/sum/Makefile statisticsFunctions/variance/Makefile statisticsFunctions/max/Makefile statisticsFunctions/min/Makefile string/Makefile string/disp/Makefile string/string/Makefile signalProcessing/Makefile signalProcessing/fft/Makefile signalProcessing/ifft/Makefile signalProcessing/levin/Makefile signalProcessing/conv/Makefile signalProcessing/conv2d/Makefile signalProcessing/hilbert/Makefile signalProcessing/crossCorr/Makefile signalProcessing/lpc2cep/Makefile signalProcessing/lev/Makefile signalProcessing/fftshift/Makefile"
+ac_config_files="$ac_config_files Makefile lib/blas/Makefile lib/lapack/Makefile type/Makefile operations/Makefile operations/addition/Makefile operations/subtraction/Makefile operations/division/Makefile operations/multiplication/Makefile matrixOperations/Makefile matrixOperations/multiplication/Makefile matrixOperations/division/Makefile matrixOperations/cat/Makefile matrixOperations/transpose/Makefile matrixOperations/trace/Makefile matrixOperations/hilbert/Makefile matrixOperations/expm/Makefile matrixOperations/eye/Makefile matrixOperations/ones/Makefile matrixOperations/infiniteNorm/Makefile matrixOperations/inversion/Makefile matrixOperations/jmat/Makefile matrixOperations/chol/Makefile matrixOperations/determ/Makefile matrixOperations/dist/Makefile matrixOperations/fill/Makefile matrixOperations/magnitude/Makefile matrixOperations/squaredMagnitude/Makefile matrixOperations/logm/Makefile matrixOperations/powm/Makefile matrixOperations/zeros/Makefile matrixOperations/spec/Makefile matrixOperations/spec2/Makefile implicitList/Makefile elementaryFunctions/Makefile elementaryFunctions/cos/Makefile elementaryFunctions/cosh/Makefile elementaryFunctions/acos/Makefile elementaryFunctions/acosh/Makefile elementaryFunctions/sin/Makefile elementaryFunctions/sinh/Makefile elementaryFunctions/asin/Makefile elementaryFunctions/asinh/Makefile elementaryFunctions/tan/Makefile elementaryFunctions/tanh/Makefile elementaryFunctions/atan/Makefile elementaryFunctions/atan2/Makefile elementaryFunctions/atanh/Makefile elementaryFunctions/log/Makefile elementaryFunctions/log1p/Makefile elementaryFunctions/log10/Makefile elementaryFunctions/exp/Makefile elementaryFunctions/exp10/Makefile elementaryFunctions/sqrt/Makefile elementaryFunctions/lnp1m1/Makefile elementaryFunctions/pow/Makefile elementaryFunctions/ceil/Makefile elementaryFunctions/fix/Makefile elementaryFunctions/floor/Makefile elementaryFunctions/int/Makefile elementaryFunctions/round/Makefile auxiliaryFunctions/Makefile auxiliaryFunctions/abs/Makefile auxiliaryFunctions/find/Makefile auxiliaryFunctions/find2d/Makefile auxiliaryFunctions/frexp/Makefile auxiliaryFunctions/isempty/Makefile auxiliaryFunctions/isnan/Makefile auxiliaryFunctions/rand/Makefile auxiliaryFunctions/sign/Makefile auxiliaryFunctions/size/Makefile auxiliaryFunctions/length/Makefile auxiliaryFunctions/type/Makefile auxiliaryFunctions/pythag/Makefile auxiliaryFunctions/conj/Makefile statisticsFunctions/Makefile statisticsFunctions/mean/Makefile statisticsFunctions/prod/Makefile statisticsFunctions/sum/Makefile statisticsFunctions/variance/Makefile statisticsFunctions/max/Makefile statisticsFunctions/min/Makefile string/Makefile string/disp/Makefile string/string/Makefile signalProcessing/Makefile signalProcessing/fft/Makefile signalProcessing/ifft/Makefile signalProcessing/levin/Makefile signalProcessing/conv/Makefile signalProcessing/conv2d/Makefile signalProcessing/hilbert/Makefile signalProcessing/crossCorr/Makefile signalProcessing/lpc2cep/Makefile signalProcessing/lev/Makefile signalProcessing/fftshift/Makefile"
 
 
 
@@ -22816,6 +22816,11 @@ do
     "elementaryFunctions/sqrt/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/sqrt/Makefile" ;;
     "elementaryFunctions/lnp1m1/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/lnp1m1/Makefile" ;;
     "elementaryFunctions/pow/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/pow/Makefile" ;;
+    "elementaryFunctions/ceil/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/ceil/Makefile" ;;
+    "elementaryFunctions/fix/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/fix/Makefile" ;;
+    "elementaryFunctions/floor/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/floor/Makefile" ;;
+    "elementaryFunctions/int/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/int/Makefile" ;;
+    "elementaryFunctions/round/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/round/Makefile" ;;
     "auxiliaryFunctions/Makefile") CONFIG_FILES="$CONFIG_FILES auxiliaryFunctions/Makefile" ;;
     "auxiliaryFunctions/abs/Makefile") CONFIG_FILES="$CONFIG_FILES auxiliaryFunctions/abs/Makefile" ;;
     "auxiliaryFunctions/find/Makefile") CONFIG_FILES="$CONFIG_FILES auxiliaryFunctions/find/Makefile" ;;
diff --git a/scilab2c/src/configure.ac b/scilab2c/src/configure.ac
index d24d8aab..bbfb8408 100644
--- a/scilab2c/src/configure.ac
+++ b/scilab2c/src/configure.ac
@@ -212,6 +212,11 @@ elementaryFunctions/exp10/Makefile
 elementaryFunctions/sqrt/Makefile
 elementaryFunctions/lnp1m1/Makefile
 elementaryFunctions/pow/Makefile
+elementaryFunctions/ceil/Makefile
+elementaryFunctions/fix/Makefile
+elementaryFunctions/floor/Makefile
+elementaryFunctions/int/Makefile
+elementaryFunctions/round/Makefile
 auxiliaryFunctions/Makefile
 auxiliaryFunctions/abs/Makefile
 auxiliaryFunctions/find/Makefile