update

6 files changed, 88 insertions, 4 deletions

diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
index 5a998ad9..82caabb1 100644
--- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
+++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
@@ -1,16 +1,50 @@
 //SCI2C: DEFAULT_PRECISION= FLOAT

 
+
 function mainfunction()

+s5 = [ 1 ; 2+%i; 2; 4; 5 ] 
+s6 = find(s5==1)
+disp(s6)
 
-s1 = [1; 1;  1; 3; 7]
+s7 = [1 ; 2+%i; 1; 1; 5 ] 
+s8 = find(s7==1)
+disp(s8)
 
-s2 = find(s1==3)
 
-disp(s2)
+s9 = [ 1 ; 2; 2+%i; 4; 5 ] 
+s10 = find(s9==1)
+disp(s10)
+
+s11 = [1 ; 2; 1+%i; 1; 5 ] 
+s12 = find(s11==1)
+disp(s12)
 
 
+s13 = [ 1+%i ; 2; 2+%i; 4; 5 ] 
+s14 = find(s13==2)
+disp(s14)
 
+s15 = [1+%i ; 2; 1+%i; 2; 2 ] 
+s16 = find(s15==2)
+disp(s16)
+s17 = [ 1+%i ; 2+%i; 2+%i; 4; 5 ] 
+s18 = find(s17==2+%i)
+disp(s18)
 
+s21 = [1+%i ; 2; 1+%i; 2; 2 ] 
+s22 = find(s21==7)
+disp(s22)
+
+s19 = [1+%i ; 2+%i; 1+%i; 2; 2 ] 
+s20 = find(s19==2+%i)
+disp(s20)
+
+s1 = [ 1 ; 2; 3; 4; 5 ] 
+s2 = find(s1==1)
+disp(s2)
 
+s3 = [ 1 ; 2; 1; 1; 5 ] 
+s4 = find(s3==1)
+disp(s4)
 
 endfunction
diff --git a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
index 533086c7..ef316cfb 100644
--- a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
+++ b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc
@@ -142,7 +142,29 @@ SWSRCS	=	\
 	$(CSRCDIR)/conesa.c\
 	$(CSRCDIR)/donesa.c\
 	$(CSRCDIR)/sonesa.c\
-	$(CSRCDIR)/zonesa.c
+	$(CSRCDIR)/zonesa.c\
+	$(CSRCDIR)/crdivs.c\
+	$(CSRCDIR)/crdiva.c \
+	$(CSRCDIR)/drdivs.c\
+	$(CSRCDIR)/drdiva.c \
+	$(CSRCDIR)/srdivs.c\
+	$(CSRCDIR)/srdiva.c \
+	$(CSRCDIR)/zrdivs.c\
+	$(CSRCDIR)/zrdiva.c\
+	$(CSRCDIR)/cldivs.c\
+	$(CSRCDIR)/cldiva.c \
+	$(CSRCDIR)/dldivs.c\
+	$(CSRCDIR)/dldiva.c \
+	$(CSRCDIR)/sldivs.c\
+	$(CSRCDIR)/sldiva.c \
+	$(CSRCDIR)/zldivs.c\
+	$(CSRCDIR)/zldiva.c\
+	$(CSRCDIR)/cconjs.c\
+	$(CSRCDIR)/cconja.c\
+	$(CSRCDIR)/zconjs.c\
+	$(CSRCDIR)/zconja.c\
+	$(CSRCDIR)/disp.c
+	
 	
 #	$(CSRCDIR)/clog10s.c \
 #	$(CSRCDIR)/zlog10s.c \
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2ccode/sabsa.c b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/sabsa.c
index df5af141..afa2e3cb 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2ccode/sabsa.c
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2ccode/sabsa.c
@@ -14,6 +14,7 @@
 
 void	sabsa(float *in, int size, float* out) {
   int i = 0;
+  
   for (i = 0; i < size; ++i) {
     out[i] = sabss(in[i]);
   }
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpApex.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpApex.h
index a0925707..e2422267 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpApex.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/OpApex.h
@@ -13,6 +13,7 @@
 
 #include "floatComplex.h"
 #include "doubleComplex.h"
+#include "int_conj.h"
 #include "conj.h"
 
 /*
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
index 9d9b7242..e32e1357 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
@@ -75,3 +75,14 @@
 /* interfacing fill */
 #include "fill.h"
/* interfacing ones */
 #include "ones.h"
+/* interfacing mean */
+#include "mean.h"
+#include "int_mean.h"
/* interfacing division */
+#include "division.h"
+#include "int_OpSlash.h"
+#include "int_OpDotSlash.h"
+#include "int_OpBackSlash.h"
+#include "int_OpDotBackSlash.h"
+/* interfacing conj */
+#include "conj.h"
+#include "int_conj.h"
diff --git a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 6e7f9b4d..0fab6f5c 100644
--- a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -1107,8 +1107,17 @@ PrintStringInfo('z0z0'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('z0z2'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('z2z0'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('z2z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+
+PrintStringInfo('z0d0'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('z2d0'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('c0s0'+ArgSeparator+'c2',ClassFileName,'file','y');
 PrintStringInfo('c2s0'+ArgSeparator+'c2',ClassFileName,'file','y');
+
+PrintStringInfo('s0c0'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('s2c0'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('d0z0'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('d2z0'+ArgSeparator+'z2',ClassFileName,'file','y');
+
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'OpRc';
 PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'both','y');
@@ -1162,6 +1171,12 @@ PrintStringInfo('s2c0'+ArgSeparator+'c2',ClassFileName,'file','y');
 PrintStringInfo('d0z0'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('d2z0'+ArgSeparator+'z2',ClassFileName,'file','y');
 
+PrintStringInfo('s2c2'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('c2s2'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('d2z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('z2d2'+ArgSeparator+'z2',ClassFileName,'file','y');
+
+
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'OpCc';
 PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'both','y');