diff options
Diffstat (limited to 'src/Scilab2C')
3 files changed, 88 insertions, 18 deletions
diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci index 35d5456d..d1212dac 100644 --- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci +++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci @@ -2,20 +2,31 @@ function mainfunction()
-s1 = 2; s2 = 3; -a = 2; b = 4; +// test OpEqual +disp(1<>1) +disp(1<>2) +disp(1<>2+%i) +disp(1+%i<>2) +disp(1+%i<>2+%i) -A = ones(3,4); B = ones(3,4); +a=[1 2 ; 3 4] +b=[5 2 ; 6+%i 1-%i] -t1 = 0; -t2 = 0; -C = LinComb(s1,a,s2,b,t1,t2); // s1*a+s2*b +disp(a<>a) +disp(a<>b) +disp(b<>a) +disp(b<>b) -T1 = A; -T2 = A; -D = LinComb(s1,A,s2,B,T1,T2); // s1*A+s2*B -disp(C); -disp(D); +disp(3<>a) +disp(5<>b) +disp(a<>4) +disp(b<>2) + +disp(1+%i<>a) +disp(1-%i<>b) +disp(a<>6+%i) +disp(b<>6+%i) + endfunction diff --git a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc index 1881282a..ce03f74d 100644 --- a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc +++ b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc @@ -24,7 +24,6 @@ SWSRCS = \ $(CSRCDIR)/doubleComplex.c \ $(CSRCDIR)/floatComplex.c \ $(CSRCDIR)/RealToComplex.c \ - $(CSRCDIR)/OpEqual.c \ $(CSRCDIR)/OpIns.c \ $(CSRCDIR)/OpExt.c \ $(CSRCDIR)/FileManagement.c \ diff --git a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 1b0e0cfb..163c1816 100644 --- a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -827,6 +827,11 @@ PrintStringInfo('z0z0'+ArgSeparator+'d0',ClassFileName,'file','y'); PrintStringInfo('g0g0'+ArgSeparator+'s0',ClassFileName,'file','y'); PrintStringInfo('g0g0'+ArgSeparator+'d0',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('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y'); PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('c2c0'+ArgSeparator+'s2',ClassFileName,'file','y'); @@ -834,12 +839,22 @@ PrintStringInfo('z2z0'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('g2g0'+ArgSeparator+'s2',ClassFileName,'file','y'); PrintStringInfo('g2g0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('s2c0'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('d2z0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('c2s0'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('z2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); + PrintStringInfo('s0s2'+ArgSeparator+'s2',ClassFileName,'file','y'); PrintStringInfo('d0d2'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('c0c2'+ArgSeparator+'s2',ClassFileName,'file','y'); PrintStringInfo('z0z2'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('g0g2'+ArgSeparator+'s2',ClassFileName,'file','y'); PrintStringInfo('g0g2'+ArgSeparator+'d2',ClassFileName,'file','y'); + +PrintStringInfo('s0c2'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('d0z2'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('c0s2'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('z0d2'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y'); PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y'); @@ -848,12 +863,11 @@ PrintStringInfo('z2z2'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('g2g2'+ArgSeparator+'s2',ClassFileName,'file','y'); PrintStringInfo('g2g2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('c2s0'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('z2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('z0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('c0s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -PrintStringInfo('d2z0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s2cF0'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('s2c2'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('d2z2'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('c2s2'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('z2d2'+ArgSeparator+'d2',ClassFileName,'file','y'); + // --- Annotation Function And Function List Function. --- FunctionName = 'OpLogEq'; @@ -1618,6 +1632,52 @@ PrintStringInfo('z2d0d2z2'+ArgSeparator,ClassFileName,'file','y'); PrintStringInfo('z2d2d0z2'+ArgSeparator,ClassFileName,'file','y'); PrintStringInfo('z2d2d2z2'+ArgSeparator,ClassFileName,'file','y'); +//Mixed input arguments +PrintStringInfo('s2s0c0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('s2s2c0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('s2s2c2'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('s2s0s0c0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('s2s0s2c0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('s2s2s0c0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('s2s2s2c0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('s2s0s2c2'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('s2s2s0c2'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('s2s2s2c2'+ArgSeparator,ClassFileName,'file','y'); + +PrintStringInfo('d2d0z0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('d2d2z0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('d2d2z2'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('d2d0d0z0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('d2d0d2z0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('d2d2d0z0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('d2d2d2z0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('d2d0d2z2'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('d2d2d0z2'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('d2d2d2z2'+ArgSeparator,ClassFileName,'file','y'); + +PrintStringInfo('c2s0s0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('c2s2s0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('c2s2s2'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('c2s0s0s0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('c2s0s2s0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('c2s2s0s0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('c2s2s2s0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('c2s0s2s2'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('c2s2s0s2'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('c2s2s2s2'+ArgSeparator,ClassFileName,'file','y'); + +PrintStringInfo('z2d0d0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('z2d2d0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('z2d2d2'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('z2d0d0d0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('z2d0d2d0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('z2d2d0d0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('z2d2d2d0'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('z2d0d2d2'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('z2d2d0d2'+ArgSeparator,ClassFileName,'file','y'); +PrintStringInfo('z2d2d2d2'+ArgSeparator,ClassFileName,'file','y'); + + // --- Annotation Function And Function List Function. --- FunctionName = 'OpIns'; PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'both','y'); |