Change output precision but need some fixes

3 files changed, 26 insertions, 48 deletions

diff --git a/src/Scilab2C/SCI2CTests/Mes_tests/implicitList/mainfunctionImplicitList.sci b/src/Scilab2C/SCI2CTests/Mes_tests/implicitList/mainfunctionImplicitList.sci
index e9562813..8d7c6912 100644
--- a/src/Scilab2C/SCI2CTests/Mes_tests/implicitList/mainfunctionImplicitList.sci
+++ b/src/Scilab2C/SCI2CTests/Mes_tests/implicitList/mainfunctionImplicitList.sci
@@ -21,16 +21,16 @@ disp(1:3:10)
 
 //complexe
 
-//2+%i:2-%i
+2+%i:2-%i
 
-//1+%i:6+%i*5
+1+%i:6+%i*5
 
-//2+%i*3:1-%i*4:2+%i*2
+2+%i*3:1-%i*4:2+%i*2
 
-//2+%i:1+%i:5+%i
+2+%i:1+%i:5+%i
 
-//1+%i:2+%i:1+%i
+1+%i:2+%i:1+%i
 
-//1+%i:3+%i:10+%i
+1+%i:3+%i:10+%i
 
 endfunction
diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
index a81dc0d2..0fafb592 100644
--- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
+++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
@@ -1,50 +1,20 @@
-//SCI2C: DEFAULT_PRECISION= FLOAT

+//SCI2C: DEFAULT_PRECISION= DOUBLE

 
 function mainfunction()
 
-//test Hat_DotHat
+//test OpColon
 
-disp(4.1^3.5);
-disp(4.1.^3.5);
 
-disp(4.4^(3.2+%i*1.1));
-disp(4.4.^(3.2+%i*1.1));
+2+%i:2-%i
 
-disp((3.2+%i*1.1)^4.4);
-disp((3.2+%i*1.1).^4.4);
+1+%i:6+%i*5
 
-disp((3.2+%i*1.1)^(4.4+2.6*%i));
-disp((3.2+%i*1.1).^(4.4+2.6*%i));
+2+%i*3:1-%i*4:2+%i*2
 
-a=[1.2 4.1 3.9; 3.7 2.6 8.1];
-b=a+[2.5 3.9 8.7; 2.5 0.2 3.3]*%i;
+2+%i:1+%i:5+%i
 
-disp(1.2^a)
-disp(1.2.^a)
+1+%i:2+%i:1+%i
 
-disp(1.2^b)
-disp(1.2.^b)
-
-disp((1.2+%i*1.1)^a)
-disp((1.2+%i*1.1).^a)
-
-disp((1.2+%i*1.1)^b)
-disp((1.2+%i*1.1).^b)
-
-disp(a.^a)
-disp(a.^b)
-
-disp(b.^a)
-disp(b.^b)
-
-c=[1.2 1.3; 1.4 5.1];
-
-disp(c^2.1);
-disp(c^(2.1+%i*4.6));
-
-d=c+[4.1 2.1; 4.6 5.1]*%i;
-
-disp(d^2.1);
-disp(d^(2.1+%i*4.6));
+1+%i:3+%i:10+%i
 
 endfunction
diff --git a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index d7b7d411..1c90a009 100644
--- a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -396,7 +396,9 @@ 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_USER',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER
 PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
 
@@ -468,19 +470,25 @@ PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'both','y');
 ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
 PrintStringInfo('NIN=          0',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP=    FA_TP_USER',ClassFileName,'file','y');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 
 PrintStringInfo('NIN=          1',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP=    FA_TP_USER',ClassFileName,'file','y');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(IN(1).SZ)',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(IN(1).SZ)',ClassFileName,'file','y');
 
 PrintStringInfo('NIN=          2',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP=    FA_TP_USER',ClassFileName,'file','y');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= IN(1).VAL',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= IN(2).VAL',ClassFileName,'file','y');